summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlegacy/4965-rs.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-03-28 18:40:06 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2013-03-28 18:40:06 (GMT)
commit630a216da662ba4197e330118fc55d772a2d7ec9 (patch)
treeddadafda9ba834e74e7f882d761900e08bb1ca1c /drivers/net/wireless/iwlegacy/4965-rs.c
parent91c5746425aed8f7188a351f1224a26aa232e4b3 (diff)
parent2e1253d640eb7f8707d2591c93097c1e9f9c71d5 (diff)
downloadlinux-fsl-qoriq-630a216da662ba4197e330118fc55d772a2d7ec9.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlegacy/4965-rs.c')
-rw-r--r--drivers/net/wireless/iwlegacy/4965-rs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c
index e8324b5..6c7493c 100644
--- a/drivers/net/wireless/iwlegacy/4965-rs.c
+++ b/drivers/net/wireless/iwlegacy/4965-rs.c
@@ -2152,7 +2152,7 @@ il4965_rs_initialize_lq(struct il_priv *il, struct ieee80211_conf *conf,
int rate_idx;
int i;
u32 rate;
- u8 use_green = il4965_rs_use_green(il, sta);
+ u8 use_green;
u8 active_tbl = 0;
u8 valid_tx_ant;
struct il_station_priv *sta_priv;
@@ -2160,6 +2160,7 @@ il4965_rs_initialize_lq(struct il_priv *il, struct ieee80211_conf *conf,
if (!sta || !lq_sta)
return;
+ use_green = il4965_rs_use_green(il, sta);
sta_priv = (void *)sta->drv_priv;
i = lq_sta->last_txrate_idx;