From 82304b59e8b3d3120661c41d28134a77dec92ab0 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 1 Oct 2010 17:05:19 -0400 Subject: [PATCH] --- yaml --- r: 215031 b: refs/heads/master c: e7480bbb926c5816e4fbfca70748096bbe0e4978 h: refs/heads/master i: 215029: 224ff77581dd9fdade811e9d30c5abebaa988272 215027: e59c3d0d2d943b48f72c8df71c14d88e4a270f1a 215023: 5a626671db1b598e2ceb47f43a59ec2052c93e24 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b324c4e9d716..5cd29e62b470 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 691895e7e2204be9a717809fb78d6ff7c10b470a +refs/heads/master: e7480bbb926c5816e4fbfca70748096bbe0e4978 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 2b2982782bcd..cd13aa82f835 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -1291,7 +1291,7 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk, rates = 0; basic_rates = 0; - sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; + sband = local->hw.wiphy->bands[wk->chan->band]; for (i = 0; i < elems.supp_rates_len; i++) { int rate = (elems.supp_rates[i] & 0x7f) * 5; @@ -1327,11 +1327,11 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk, } } - sta->sta.supp_rates[local->hw.conf.channel->band] = rates; + sta->sta.supp_rates[wk->chan->band] = rates; sdata->vif.bss_conf.basic_rates = basic_rates; /* cf. IEEE 802.11 9.2.12 */ - if (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ && + if (wk->chan->band == IEEE80211_BAND_2GHZ && have_higher_than_11mbit) sdata->flags |= IEEE80211_SDATA_OPERATING_GMODE; else