From: Javier Cardona Date: Wed, 4 May 2011 17:24:56 +0000 (+0000) Subject: cfg80211: Use capability info to detect mesh beacons. X-Git-Tag: 1.9.4~7^2~1 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=2104f41a613c67f4de7e2fa6511f19f990fe17c4;p=carl9170fw.git cfg80211: Use capability info to detect mesh beacons. Mesh beacons no longer use all-zeroes BSSID. Beacon frames for MBSS, infrastructure BSS, or IBSS are differentiated by the Capability Information field in the Beacon frame. A mesh STA sets the ESS and IBSS subfields to 0 in transmitted Beacon or Probe Response management frames. Signed-off-by: Javier Cardona Signed-off-by: Christian Lamparter --- diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 2be159d..45b4374 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -1032,6 +1032,11 @@ struct ieee80211_ht_info { #define WLAN_CAPABILITY_ESS (1<<0) #define WLAN_CAPABILITY_IBSS (1<<1) + +/* A mesh STA sets the ESS and IBSS capability bits to zero */ +#define WLAN_CAPABILITY_IS_MBSS(cap) \ + (!((cap) & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS))) + #define WLAN_CAPABILITY_CF_POLLABLE (1<<2) #define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3) #define WLAN_CAPABILITY_PRIVACY (1<<4)