diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-02-05 16:54:31 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-11 18:44:59 +0100 |
| commit | 8cef2c9df88fdd13f518e6607de9d664b31f26cc (patch) | |
| tree | f8a4d29db6012ad3468a5d9435562fc1f383209a /include/net/cfg80211.h | |
| parent | 83c7aa1a1475ae1c42640ab6e4559016142efc67 (diff) | |
| download | linux-3.10-8cef2c9df88fdd13f518e6607de9d664b31f26cc.tar.gz linux-3.10-8cef2c9df88fdd13f518e6607de9d664b31f26cc.tar.bz2 linux-3.10-8cef2c9df88fdd13f518e6607de9d664b31f26cc.zip | |
cfg80211: move TSF into IEs
While technically the TSF isn't an IE, it can be
necessary to distinguish between the TSF from a
beacon and a probe response, in particular in
order to know the next DTIM TBTT, as not all APs
are spec compliant wrt. TSF==0 being a DTIM TBTT
and thus the DTIM count needs to be taken into
account as well.
To allow this, move the TSF into the IE struct
so it can be known whence it came.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net/cfg80211.h')
| -rw-r--r-- | include/net/cfg80211.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index fb766314b3a..77686ca2894 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1266,11 +1266,13 @@ enum cfg80211_signal_type { /** * struct cfg80211_bss_ie_data - BSS entry IE data + * @tsf: TSF contained in the frame that carried these IEs * @rcu_head: internal use, for freeing * @len: length of the IEs * @data: IE data */ struct cfg80211_bss_ies { + u64 tsf; struct rcu_head rcu_head; int len; u8 data[]; @@ -1284,7 +1286,6 @@ struct cfg80211_bss_ies { * * @channel: channel this BSS is on * @bssid: BSSID of the BSS - * @tsf: timestamp of last received update * @beacon_interval: the beacon interval as from the frame * @capability: the capability field in host byte order * @ies: the information elements (Note that there is no guarantee that these @@ -1304,8 +1305,6 @@ struct cfg80211_bss_ies { * @priv: private area for driver use, has at least wiphy->bss_priv_size bytes */ struct cfg80211_bss { - u64 tsf; - struct ieee80211_channel *channel; const struct cfg80211_bss_ies __rcu *ies; |