aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211/main.c
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 /net/mac80211/main.c
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 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 59be9e78269..ab8a860444a 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -249,15 +249,15 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
if (local->ops->bss_info_changed)
local->ops->bss_info_changed(local_to_hw(local),
&sdata->vif,
- &sdata->bss_conf,
+ &sdata->vif.bss_conf,
changed);
}
u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata)
{
- sdata->bss_conf.use_cts_prot = false;
- sdata->bss_conf.use_short_preamble = false;
- sdata->bss_conf.use_short_slot = false;
+ sdata->vif.bss_conf.use_cts_prot = false;
+ sdata->vif.bss_conf.use_short_preamble = false;
+ sdata->vif.bss_conf.use_short_slot = false;
return BSS_CHANGED_ERP_CTS_PROT |
BSS_CHANGED_ERP_PREAMBLE |
BSS_CHANGED_ERP_SLOT;