summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/main.c
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-10-05 11:56:02 +0200
committerLuciano Coelho <coelho@ti.com>2011-10-07 08:32:52 +0300
commit74ec839557878007c3f97d1bc89e09fde5d0f3fa (patch)
treed7bbb8c67cab1a6f69e8f87c97383d82b37c1983 /drivers/net/wireless/wl12xx/main.c
parent6ec45dc282f6983d5685758c5e8993bc2c818d3c (diff)
wl12xx: move ps_poll_failures and psm_entry_retry into wlvif
move ps_poll_failures and psm_entry_retries into the per-interface data, rather than being global. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/main.c')
-rw-r--r--drivers/net/wireless/wl12xx/main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index cb2355354bf..fd2b9f21acf 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -2141,7 +2141,6 @@ deinit:
wl->band = IEEE80211_BAND_2GHZ;
wl->rx_counter = 0;
- wl->psm_entry_retry = 0;
wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
wl->tx_blocks_available = 0;
wl->tx_allocated_blocks = 0;
@@ -3540,7 +3539,7 @@ sta_not_found:
wlvif->aid = bss_conf->aid;
set_assoc = true;
- wl->ps_poll_failures = 0;
+ wlvif->ps_poll_failures = 0;
/*
* use basic rates from AP, and determine lowest rate
@@ -4894,7 +4893,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
wl->channel = WL1271_DEFAULT_CHANNEL;
wl->rx_counter = 0;
- wl->psm_entry_retry = 0;
wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
wl->band = IEEE80211_BAND_2GHZ;
wl->vif = NULL;