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>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 8ea30902d5db..28382b5c7c25 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -964,16 +964,16 @@ static int ieee80211_change_bss(struct wiphy *wiphy,
                 return -EINVAL;
 
         if (params->use_cts_prot >= 0) {
-                sdata->bss_conf.use_cts_prot = params->use_cts_prot;
+                sdata->vif.bss_conf.use_cts_prot = params->use_cts_prot;
                 changed |= BSS_CHANGED_ERP_CTS_PROT;
         }
         if (params->use_short_preamble >= 0) {
-                sdata->bss_conf.use_short_preamble =
+                sdata->vif.bss_conf.use_short_preamble =
                         params->use_short_preamble;
                 changed |= BSS_CHANGED_ERP_PREAMBLE;
         }
         if (params->use_short_slot_time >= 0) {
-                sdata->bss_conf.use_short_slot =
+                sdata->vif.bss_conf.use_short_slot =
                         params->use_short_slot_time;
                 changed |= BSS_CHANGED_ERP_SLOT;
         }