diff options
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 196dd39f6286..9c5f5c37a49e 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -572,7 +572,7 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local, | |||
572 | static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata, | 572 | static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata, |
573 | u16 capab, bool erp_valid, u8 erp) | 573 | u16 capab, bool erp_valid, u8 erp) |
574 | { | 574 | { |
575 | struct ieee80211_bss_conf *bss_conf = &sdata->bss_conf; | 575 | struct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf; |
576 | #ifdef CONFIG_MAC80211_VERBOSE_DEBUG | 576 | #ifdef CONFIG_MAC80211_VERBOSE_DEBUG |
577 | struct ieee80211_if_sta *ifsta = &sdata->u.sta; | 577 | struct ieee80211_if_sta *ifsta = &sdata->u.sta; |
578 | #endif | 578 | #endif |
@@ -718,9 +718,9 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, | |||
718 | ifsta->ssid, ifsta->ssid_len); | 718 | ifsta->ssid, ifsta->ssid_len); |
719 | if (bss) { | 719 | if (bss) { |
720 | /* set timing information */ | 720 | /* set timing information */ |
721 | sdata->bss_conf.beacon_int = bss->beacon_int; | 721 | sdata->vif.bss_conf.beacon_int = bss->beacon_int; |
722 | sdata->bss_conf.timestamp = bss->timestamp; | 722 | sdata->vif.bss_conf.timestamp = bss->timestamp; |
723 | sdata->bss_conf.dtim_period = bss->dtim_period; | 723 | sdata->vif.bss_conf.dtim_period = bss->dtim_period; |
724 | 724 | ||
725 | changed |= ieee80211_handle_bss_capability(sdata, | 725 | changed |= ieee80211_handle_bss_capability(sdata, |
726 | bss->capability, bss->has_erp_value, bss->erp_value); | 726 | bss->capability, bss->has_erp_value, bss->erp_value); |
@@ -730,9 +730,9 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, | |||
730 | 730 | ||
731 | if (conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE) { | 731 | if (conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE) { |
732 | changed |= BSS_CHANGED_HT; | 732 | changed |= BSS_CHANGED_HT; |
733 | sdata->bss_conf.assoc_ht = 1; | 733 | sdata->vif.bss_conf.assoc_ht = 1; |
734 | sdata->bss_conf.ht_cap = &conf->ht_cap; | 734 | sdata->vif.bss_conf.ht_cap = &conf->ht_cap; |
735 | sdata->bss_conf.ht_bss_conf = &conf->ht_bss_conf; | 735 | sdata->vif.bss_conf.ht_bss_conf = &conf->ht_bss_conf; |
736 | } | 736 | } |
737 | 737 | ||
738 | ifsta->flags |= IEEE80211_STA_PREV_BSSID_SET; | 738 | ifsta->flags |= IEEE80211_STA_PREV_BSSID_SET; |
@@ -742,7 +742,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, | |||
742 | ifsta->last_probe = jiffies; | 742 | ifsta->last_probe = jiffies; |
743 | ieee80211_led_assoc(local, 1); | 743 | ieee80211_led_assoc(local, 1); |
744 | 744 | ||
745 | sdata->bss_conf.assoc = 1; | 745 | sdata->vif.bss_conf.assoc = 1; |
746 | /* | 746 | /* |
747 | * For now just always ask the driver to update the basic rateset | 747 | * For now just always ask the driver to update the basic rateset |
748 | * when we have associated, we aren't checking whether it actually | 748 | * when we have associated, we aren't checking whether it actually |
@@ -847,15 +847,15 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, | |||
847 | ifsta->flags &= ~IEEE80211_STA_ASSOCIATED; | 847 | ifsta->flags &= ~IEEE80211_STA_ASSOCIATED; |
848 | changed |= ieee80211_reset_erp_info(sdata); | 848 | changed |= ieee80211_reset_erp_info(sdata); |
849 | 849 | ||
850 | if (sdata->bss_conf.assoc_ht) | 850 | if (sdata->vif.bss_conf.assoc_ht) |
851 | changed |= BSS_CHANGED_HT; | 851 | changed |= BSS_CHANGED_HT; |
852 | 852 | ||
853 | sdata->bss_conf.assoc_ht = 0; | 853 | sdata->vif.bss_conf.assoc_ht = 0; |
854 | sdata->bss_conf.ht_cap = NULL; | 854 | sdata->vif.bss_conf.ht_cap = NULL; |
855 | sdata->bss_conf.ht_bss_conf = NULL; | 855 | sdata->vif.bss_conf.ht_bss_conf = NULL; |
856 | 856 | ||
857 | ieee80211_led_assoc(local, 0); | 857 | ieee80211_led_assoc(local, 0); |
858 | sdata->bss_conf.assoc = 0; | 858 | sdata->vif.bss_conf.assoc = 0; |
859 | 859 | ||
860 | ieee80211_sta_send_apinfo(sdata, ifsta); | 860 | ieee80211_sta_send_apinfo(sdata, ifsta); |
861 | 861 | ||
@@ -1182,7 +1182,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, | |||
1182 | u64 rates, basic_rates; | 1182 | u64 rates, basic_rates; |
1183 | u16 capab_info, status_code, aid; | 1183 | u16 capab_info, status_code, aid; |
1184 | struct ieee802_11_elems elems; | 1184 | struct ieee802_11_elems elems; |
1185 | struct ieee80211_bss_conf *bss_conf = &sdata->bss_conf; | 1185 | struct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf; |
1186 | u8 *pos; | 1186 | u8 *pos; |
1187 | int i, j; | 1187 | int i, j; |
1188 | bool have_higher_than_11mbit = false; | 1188 | bool have_higher_than_11mbit = false; |
@@ -1324,7 +1324,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, | |||
1324 | } | 1324 | } |
1325 | 1325 | ||
1326 | sta->sta.supp_rates[local->hw.conf.channel->band] = rates; | 1326 | sta->sta.supp_rates[local->hw.conf.channel->band] = rates; |
1327 | sdata->bss_conf.basic_rates = basic_rates; | 1327 | sdata->vif.bss_conf.basic_rates = basic_rates; |
1328 | 1328 | ||
1329 | /* cf. IEEE 802.11 9.2.12 */ | 1329 | /* cf. IEEE 802.11 9.2.12 */ |
1330 | if (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ && | 1330 | if (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ && |