summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-01 02:06:18 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-02-11 18:44:57 +0100
commit776b3580178f2065838fa0db0eb7a41b57495c0a (patch)
tree7a12015c647583690755f53482e40de7f57b3a31 /include/net
parent1f4ac5a63f897a480fffd0d5c843b03f02c384a5 (diff)
downloadop-kernel-dev-776b3580178f2065838fa0db0eb7a41b57495c0a.zip
op-kernel-dev-776b3580178f2065838fa0db0eb7a41b57495c0a.tar.gz
cfg80211: track hidden SSID networks properly
Currently, cfg80211 will copy beacon IEs from a previously received hidden SSID beacon to a probe response entry, if that entry is created after the beacon entry. However, if it is the other way around, or if the beacon is updated, such changes aren't propagated. Fix this by tracking the relation between the probe response and beacon BSS structs in this case. In case drivers have private data stored in a BSS struct and need access to such data from a beacon entry, cfg80211 now provides the hidden_beacon_bss pointer from the probe response entry to the beacon entry. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/cfg80211.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 5d8554b..04a702d 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1292,7 +1292,14 @@ struct cfg80211_bss_ies {
* either the beacon_ies or proberesp_ies depending on whether Probe
* Response frame has been received
* @beacon_ies: the information elements from the last Beacon frame
+ * (implementation note: if @hidden_beacon_bss is set this struct doesn't
+ * own the beacon_ies, but they're just pointers to the ones from the
+ * @hidden_beacon_bss struct)
* @proberesp_ies: the information elements from the last Probe Response frame
+ * @hidden_beacon_bss: in case this BSS struct represents a probe response from
+ * a BSS that hides the SSID in its beacon, this points to the BSS struct
+ * that holds the beacon data. @beacon_ies is still valid, of course, and
+ * points to the same data as hidden_beacon_bss->beacon_ies in that case.
* @signal: signal strength value (type depends on the wiphy's signal_type)
* @priv: private area for driver use, has at least wiphy->bss_priv_size bytes
*/
@@ -1305,6 +1312,8 @@ struct cfg80211_bss {
const struct cfg80211_bss_ies __rcu *beacon_ies;
const struct cfg80211_bss_ies __rcu *proberesp_ies;
+ struct cfg80211_bss *hidden_beacon_bss;
+
s32 signal;
u16 beacon_interval;
OpenPOWER on IntegriCloud