2022-07-11 01:09:46

by Kieran Frewen

Subject: [PATCH 06/12] mac80211: support ieee80211_ext format

Ensure S1G beacons use the new ieee80211_ext format when required.

Signed-off-by: Kieran Frewen <[email protected]>
Signed-off-by: Bassem Dawood <[email protected]>
---
net/mac80211/rx.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index d017ad14d7db..feab1d58e932 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -4772,6 +4772,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
struct ieee80211_local *local = hw_to_local(hw);
struct ieee80211_sub_if_data *sdata;
struct ieee80211_hdr *hdr;
+ struct ieee80211_ext *ext_hdr;
__le16 fc;
struct ieee80211_rx_data rx;
struct ieee80211_sub_if_data *prev;
@@ -4787,7 +4788,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
if (ieee80211_is_data(fc) || ieee80211_is_mgmt(fc))
I802_DEBUG_INC(local->dot11ReceivedFragmentCount);

- if (ieee80211_is_mgmt(fc)) {
+ if (ieee80211_is_mgmt(fc) || ieee80211_is_s1g_beacon(fc)) {
/* drop frame if too short for header */
if (skb->len < ieee80211_hdrlen(fc))
err = -ENOBUFS;
@@ -4802,13 +4803,16 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
return;
}

- hdr = (struct ieee80211_hdr *)skb->data;
+ if (ieee80211_is_s1g_beacon(fc))
+ ext_hdr = (struct ieee80211_ext *)skb->data;
+ else
+ hdr = (struct ieee80211_hdr *)skb->data;
ieee80211_parse_qos(&rx);
ieee80211_verify_alignment(&rx);

- if (unlikely(ieee80211_is_probe_resp(hdr->frame_control) ||
- ieee80211_is_beacon(hdr->frame_control) ||
- ieee80211_is_s1g_beacon(hdr->frame_control)))
+ if (unlikely(ieee80211_is_probe_resp(fc) ||
+ ieee80211_is_beacon(fc) ||
+ ieee80211_is_s1g_beacon(fc)))
ieee80211_scan_rx(local, skb);

if (ieee80211_is_data(fc)) {
@@ -4868,7 +4872,10 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
continue;
}

- rx.sta = sta_info_get_bss(prev, hdr->addr2);
+ if (ieee80211_is_s1g_beacon(fc))
+ rx.sta = sta_info_get_bss(prev, ext_hdr->u.s1g_beacon.sa);
+ else
+ rx.sta = sta_info_get_bss(prev, hdr->addr2);
rx.sdata = prev;
ieee80211_prepare_and_rx_handle(&rx, skb, false);

@@ -4876,7 +4883,10 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
}

if (prev) {
- rx.sta = sta_info_get_bss(prev, hdr->addr2);
+ if (ieee80211_is_s1g_beacon(fc))
+ rx.sta = sta_info_get_bss(prev, ext_hdr->u.s1g_beacon.sa);
+ else
+ rx.sta = sta_info_get_bss(prev, hdr->addr2);
rx.sdata = prev;

if (ieee80211_prepare_and_rx_handle(&rx, skb, true))
--
2.25.1

2022-07-12 22:20:12

by Jeff Johnson

Subject: Re: [PATCH 06/12] mac80211: support ieee80211_ext format

On 7/10/2022 6:08 PM, Kieran Frewen wrote:
> Ensure S1G beacons use the new ieee80211_ext format when required.
>
> Signed-off-by: Kieran Frewen <[email protected]>
> Signed-off-by: Bassem Dawood <[email protected]>
> ---
> net/mac80211/rx.c | 24 +++++++++++++++++-------
> 1 file changed, 17 insertions(+), 7 deletions(-)
>
> diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
> index d017ad14d7db..feab1d58e932 100644
> --- a/net/mac80211/rx.c
> +++ b/net/mac80211/rx.c
> @@ -4772,6 +4772,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
> struct ieee80211_local *local = hw_to_local(hw);
> struct ieee80211_sub_if_data *sdata;
> struct ieee80211_hdr *hdr;
> + struct ieee80211_ext *ext_hdr;
> __le16 fc;
> struct ieee80211_rx_data rx;
> struct ieee80211_sub_if_data *prev;
> @@ -4787,7 +4788,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
> if (ieee80211_is_data(fc) || ieee80211_is_mgmt(fc))
> I802_DEBUG_INC(local->dot11ReceivedFragmentCount);
>
> - if (ieee80211_is_mgmt(fc)) {
> + if (ieee80211_is_mgmt(fc) || ieee80211_is_s1g_beacon(fc)) {
> /* drop frame if too short for header */
> if (skb->len < ieee80211_hdrlen(fc))
> err = -ENOBUFS;
> @@ -4802,13 +4803,16 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
> return;
> }
>
> - hdr = (struct ieee80211_hdr *)skb->data;
> + if (ieee80211_is_s1g_beacon(fc))
> + ext_hdr = (struct ieee80211_ext *)skb->data;
> + else
> + hdr = (struct ieee80211_hdr *)skb->data;

consider extracting the SA here instead of having conditional code in
two places later?

> ieee80211_parse_qos(&rx);
> ieee80211_verify_alignment(&rx);
>
> - if (unlikely(ieee80211_is_probe_resp(hdr->frame_control) ||
> - ieee80211_is_beacon(hdr->frame_control) ||
> - ieee80211_is_s1g_beacon(hdr->frame_control)))
> + if (unlikely(ieee80211_is_probe_resp(fc) ||
> + ieee80211_is_beacon(fc) ||
> + ieee80211_is_s1g_beacon(fc)))
> ieee80211_scan_rx(local, skb);
>
> if (ieee80211_is_data(fc)) {
> @@ -4868,7 +4872,10 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
> continue;
> }
>
> - rx.sta = sta_info_get_bss(prev, hdr->addr2);
> + if (ieee80211_is_s1g_beacon(fc))
> + rx.sta = sta_info_get_bss(prev, ext_hdr->u.s1g_beacon.sa);
> + else
> + rx.sta = sta_info_get_bss(prev, hdr->addr2);
> rx.sdata = prev;
> ieee80211_prepare_and_rx_handle(&rx, skb, false);
>
> @@ -4876,7 +4883,10 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
> }
>
> if (prev) {
> - rx.sta = sta_info_get_bss(prev, hdr->addr2);
> + if (ieee80211_is_s1g_beacon(fc))
> + rx.sta = sta_info_get_bss(prev, ext_hdr->u.s1g_beacon.sa);
> + else
> + rx.sta = sta_info_get_bss(prev, hdr->addr2);
> rx.sdata = prev;
>
> if (ieee80211_prepare_and_rx_handle(&rx, skb, true))