summaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-11 01:51:51 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-10-31 19:00:15 -0400
commitbda3933a8aceedd03e0dd410844bd310033ca756 (patch)
treef4d2c70a6338e500b6db93b073801181280b1840 /include/net/mac80211.h
parent9124b07740c51cbc6e358dd0c4abc6ee8ded084d (diff)
mac80211: move bss_conf into vif
Move bss_conf into the vif struct so that drivers can access it during ->tx without having to store it in the private data or similar. No driver updates because this is only for when they want to start using it. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index fd52300b96d..94ff3eface4 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -529,11 +529,14 @@ struct ieee80211_conf {
* use during the life of a virtual interface.
*
* @type: type of this virtual interface
+ * @bss_conf: BSS configuration for this interface, either our own
+ * or the BSS we're associated to
* @drv_priv: data area for driver use, will always be aligned to
* sizeof(void *).
*/
struct ieee80211_vif {
enum nl80211_iftype type;
+ struct ieee80211_bss_conf bss_conf;
/* must be last */
u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
};