mac80211: move bss_conf into vif

[deliverable/linux.git] / net / mac80211 / main.c

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 59be9e782699321195497fd2d3f83b814b1dbedb..ab8a860444af48d51a144cf8983db9710faf8fa8 100644 (file)
--- 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;