aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-11-01 09:12:50 -0400
committerLuciano Coelho <coelho@ti.com>2011-11-08 08:36:46 -0500
commit2f8e81ad42cee6e1503462105f540214b1fb3e54 (patch)
tree0baab624e88cfe12fbe8a5cbf3652b06bb4934f5
parentfa5e13756ad5112842bd5e765d66b6c6074b74b7 (diff)
wl12xx: clear wl->vif on remove_interface
wl->vif should be cleared on remove_interface() (rather than on stop()) even when only a single vif is supported, because during vif mode change stop() might not get called (e.g. because of monitor interface existence) Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
-rw-r--r--drivers/net/wireless/wl12xx/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index c05be03907e4..51d519f93d79 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1859,7 +1859,6 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
1859 wl->tx_results_count = 0; 1859 wl->tx_results_count = 0;
1860 wl->tx_packets_count = 0; 1860 wl->tx_packets_count = 0;
1861 wl->time_offset = 0; 1861 wl->time_offset = 0;
1862 wl->vif = NULL;
1863 wl->tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT; 1862 wl->tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
1864 wl->ap_fw_ps_map = 0; 1863 wl->ap_fw_ps_map = 0;
1865 wl->ap_ps_map = 0; 1864 wl->ap_ps_map = 0;
@@ -2211,6 +2210,8 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
2211 if (!test_and_clear_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags)) 2210 if (!test_and_clear_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags))
2212 return; 2211 return;
2213 2212
2213 wl->vif = NULL;
2214
2214 /* because of hardware recovery, we may get here twice */ 2215 /* because of hardware recovery, we may get here twice */
2215 if (wl->state != WL1271_STATE_ON) 2216 if (wl->state != WL1271_STATE_ON)
2216 return; 2217 return;