mac80211: receive and process S1G beacons
S1G beacons are 802.11 Extension Frames, so the fixed header part differs from regular beacons. Add a handler to process S1G beacons and abstract out the fetching of BSSID and element start locations in the beacon body handler. Signed-off-by: Thomas Pedersen <thomas@adapt-ip.com> Link: https://lore.kernel.org/r/20200922022818.15855-14-thomas@adapt-ip.com [don't rename, small coding style cleanups] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:

committed by
Johannes Berg

parent
cac8c526ae
commit
09a740ce35
@@ -45,6 +45,58 @@ struct ieee80211_hw *wiphy_to_ieee80211_hw(struct wiphy *wiphy)
|
||||
}
|
||||
EXPORT_SYMBOL(wiphy_to_ieee80211_hw);
|
||||
|
||||
u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len,
|
||||
enum nl80211_iftype type)
|
||||
{
|
||||
__le16 fc = hdr->frame_control;
|
||||
|
||||
if (ieee80211_is_data(fc)) {
|
||||
if (len < 24) /* drop incorrect hdr len (data) */
|
||||
return NULL;
|
||||
|
||||
if (ieee80211_has_a4(fc))
|
||||
return NULL;
|
||||
if (ieee80211_has_tods(fc))
|
||||
return hdr->addr1;
|
||||
if (ieee80211_has_fromds(fc))
|
||||
return hdr->addr2;
|
||||
|
||||
return hdr->addr3;
|
||||
}
|
||||
|
||||
if (ieee80211_is_s1g_beacon(fc)) {
|
||||
struct ieee80211_ext *ext = (void *) hdr;
|
||||
|
||||
return ext->u.s1g_beacon.sa;
|
||||
}
|
||||
|
||||
if (ieee80211_is_mgmt(fc)) {
|
||||
if (len < 24) /* drop incorrect hdr len (mgmt) */
|
||||
return NULL;
|
||||
return hdr->addr3;
|
||||
}
|
||||
|
||||
if (ieee80211_is_ctl(fc)) {
|
||||
if (ieee80211_is_pspoll(fc))
|
||||
return hdr->addr1;
|
||||
|
||||
if (ieee80211_is_back_req(fc)) {
|
||||
switch (type) {
|
||||
case NL80211_IFTYPE_STATION:
|
||||
return hdr->addr2;
|
||||
case NL80211_IFTYPE_AP:
|
||||
case NL80211_IFTYPE_AP_VLAN:
|
||||
return hdr->addr1;
|
||||
default:
|
||||
break; /* fall through to the return */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
EXPORT_SYMBOL(ieee80211_get_bssid);
|
||||
|
||||
void ieee80211_tx_set_protected(struct ieee80211_tx_data *tx)
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
|
Reference in New Issue
Block a user