diff options
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 35c421b89dd2..c049f336e58a 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -1301,7 +1301,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, | |||
1301 | } | 1301 | } |
1302 | } | 1302 | } |
1303 | 1303 | ||
1304 | sta->supp_rates[local->hw.conf.channel->band] = rates; | 1304 | sta->sta.supp_rates[local->hw.conf.channel->band] = rates; |
1305 | sdata->bss_conf.basic_rates = basic_rates; | 1305 | sdata->bss_conf.basic_rates = basic_rates; |
1306 | 1306 | ||
1307 | /* cf. IEEE 802.11 9.2.12 */ | 1307 | /* cf. IEEE 802.11 9.2.12 */ |
@@ -1497,13 +1497,13 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, | |||
1497 | if (sta) { | 1497 | if (sta) { |
1498 | u64 prev_rates; | 1498 | u64 prev_rates; |
1499 | 1499 | ||
1500 | prev_rates = sta->supp_rates[band]; | 1500 | prev_rates = sta->sta.supp_rates[band]; |
1501 | /* make sure mandatory rates are always added */ | 1501 | /* make sure mandatory rates are always added */ |
1502 | sta->supp_rates[band] = supp_rates | | 1502 | sta->sta.supp_rates[band] = supp_rates | |
1503 | ieee80211_mandatory_rates(local, band); | 1503 | ieee80211_mandatory_rates(local, band); |
1504 | 1504 | ||
1505 | #ifdef CONFIG_MAC80211_IBSS_DEBUG | 1505 | #ifdef CONFIG_MAC80211_IBSS_DEBUG |
1506 | if (sta->supp_rates[band] != prev_rates) | 1506 | if (sta->sta.supp_rates[band] != prev_rates) |
1507 | printk(KERN_DEBUG "%s: updated supp_rates set " | 1507 | printk(KERN_DEBUG "%s: updated supp_rates set " |
1508 | "for %s based on beacon info (0x%llx | " | 1508 | "for %s based on beacon info (0x%llx | " |
1509 | "0x%llx -> 0x%llx)\n", | 1509 | "0x%llx -> 0x%llx)\n", |
@@ -1511,7 +1511,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, | |||
1511 | print_mac(mac, sta->sta.addr), | 1511 | print_mac(mac, sta->sta.addr), |
1512 | (unsigned long long) prev_rates, | 1512 | (unsigned long long) prev_rates, |
1513 | (unsigned long long) supp_rates, | 1513 | (unsigned long long) supp_rates, |
1514 | (unsigned long long) sta->supp_rates[band]); | 1514 | (unsigned long long) sta->sta.supp_rates[band]); |
1515 | #endif | 1515 | #endif |
1516 | } else { | 1516 | } else { |
1517 | ieee80211_ibss_add_sta(sdata, NULL, mgmt->bssid, | 1517 | ieee80211_ibss_add_sta(sdata, NULL, mgmt->bssid, |
@@ -2339,7 +2339,7 @@ struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, | |||
2339 | set_sta_flags(sta, WLAN_STA_AUTHORIZED); | 2339 | set_sta_flags(sta, WLAN_STA_AUTHORIZED); |
2340 | 2340 | ||
2341 | /* make sure mandatory rates are always added */ | 2341 | /* make sure mandatory rates are always added */ |
2342 | sta->supp_rates[band] = supp_rates | | 2342 | sta->sta.supp_rates[band] = supp_rates | |
2343 | ieee80211_mandatory_rates(local, band); | 2343 | ieee80211_mandatory_rates(local, band); |
2344 | 2344 | ||
2345 | rate_control_rate_init(sta, local); | 2345 | rate_control_rate_init(sta, local); |