[PATCH v2] wl12xx: clear wl->vif on remove_interface

[PATCH v2] wl12xx: clear wl->vif on remove_interface

[Eliad Peller]

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>
---
v2: clear wl->vif in __wl1271_op_remove_interface, so it will
    happen also on recovery

 drivers/net/wireless/wl12xx/main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index f76be5a..42489bf 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)
 	wl->tx_results_count = 0;
 	wl->tx_packets_count = 0;
 	wl->time_offset = 0;
-	wl->vif = NULL;
 	wl->tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
 	wl->ap_fw_ps_map = 0;
 	wl->ap_ps_map = 0;
@@ -2211,6 +2210,8 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
 	if (!test_and_clear_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags))
 		return;
 
+	wl->vif = NULL;
+
 	/* because of hardware recovery, we may get here twice */
 	if (wl->state != WL1271_STATE_ON)
 		return;
-- 
1.7.6.401.g6a319

Re: [PATCH v2] wl12xx: clear wl->vif on remove_interface

[Luciano Coelho]

On Tue, 2011-11-01 at 15:12 +0200, Eliad Peller wrote: 
> 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>
> ---

Applied.

-- 
Cheers,
Luca.