@@ -4895,6 +4895,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;
@@ -4911,7 +4912,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;
@@ -4926,13 +4927,17 @@ 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)) {
@@ -4991,7 +4996,10 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
prev = sdata;
continue;
}
-
+ 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_rx_for_interface(&rx, skb, false);
@@ -4999,6 +5007,10 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
}
if (prev) {
+ 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_rx_for_interface(&rx, skb, true))
Ensure S1G beacons use the new ieee80211_ext format when required. Signed-off-by: Kieran Frewen <kieran.frewen@morsemicro.com> --- net/mac80211/rx.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)