aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/3945-rs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlegacy/3945-rs.c')
-rw-r--r--drivers/net/wireless/iwlegacy/3945-rs.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-rs.c b/drivers/net/wireless/iwlegacy/3945-rs.c
index d7a83f229190..70bee1a4d876 100644
--- a/drivers/net/wireless/iwlegacy/3945-rs.c
+++ b/drivers/net/wireless/iwlegacy/3945-rs.c
@@ -342,7 +342,7 @@ il3945_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_id)
342 int i; 342 int i;
343 343
344 D_INFO("enter\n"); 344 D_INFO("enter\n");
345 if (sta_id == il->ctx.bcast_sta_id) 345 if (sta_id == il->hw_params.bcast_id)
346 goto out; 346 goto out;
347 347
348 psta = (struct il3945_sta_priv *)sta->drv_priv; 348 psta = (struct il3945_sta_priv *)sta->drv_priv;
@@ -927,8 +927,7 @@ il3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
927 927
928 rcu_read_lock(); 928 rcu_read_lock();
929 929
930 sta = 930 sta = ieee80211_find_sta(il->vif, il->stations[sta_id].sta.sta.addr);
931 ieee80211_find_sta(il->ctx.vif, il->stations[sta_id].sta.sta.addr);
932 if (!sta) { 931 if (!sta) {
933 D_RATE("Unable to find station to initialize rate scaling.\n"); 932 D_RATE("Unable to find station to initialize rate scaling.\n");
934 rcu_read_unlock(); 933 rcu_read_unlock();
@@ -944,7 +943,7 @@ il3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
944 switch (il->band) { 943 switch (il->band) {
945 case IEEE80211_BAND_2GHZ: 944 case IEEE80211_BAND_2GHZ:
946 /* TODO: this always does G, not a regression */ 945 /* TODO: this always does G, not a regression */
947 if (il->ctx.active.flags & RXON_FLG_TGG_PROTECT_MSK) { 946 if (il->active.flags & RXON_FLG_TGG_PROTECT_MSK) {
948 rs_sta->tgg = 1; 947 rs_sta->tgg = 1;
949 rs_sta->expected_tpt = il3945_expected_tpt_g_prot; 948 rs_sta->expected_tpt = il3945_expected_tpt_g_prot;
950 } else 949 } else