wl12xx: clear wl->vif on remove_interface
authorEliad Peller <eliad@wizery.com>
Tue, 1 Nov 2011 13:12:50 +0000 (15:12 +0200)
committerLuciano Coelho <coelho@ti.com>
Tue, 8 Nov 2011 13:36:46 +0000 (15:36 +0200)
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>
drivers/net/wireless/wl12xx/main.c

index c05be03..51d519f 100644 (file)
@@ -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;