wl12xx: consider bss_conf->idle instead of hw->conf.flags
authorEliad Peller <eliad@wizery.com>
Sun, 4 Mar 2012 08:55:46 +0000 (10:55 +0200)
committerLuciano Coelho <coelho@ti.com>
Mon, 5 Mar 2012 13:45:24 +0000 (15:45 +0200)
On disassociation, check only whether the current vif
is idle, instead of checking whether the device is idle.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
drivers/net/wireless/wl12xx/main.c

index 93636ea..b771106 100644 (file)
@@ -3901,7 +3901,6 @@ sta_not_found:
 
                        /* restore the bssid filter and go to dummy bssid */
                        if (was_assoc) {
-                               u32 conf_flags = wl->hw->conf.flags;
                                /*
                                 * we might have to disable roc, if there was
                                 * no IF_OPER_UP notification.
@@ -3924,7 +3923,7 @@ sta_not_found:
                                }
 
                                wl1271_unjoin(wl, wlvif);
-                               if (!(conf_flags & IEEE80211_CONF_IDLE))
+                               if (!bss_conf->idle)
                                        wl12xx_start_dev(wl, wlvif);
                        }
                }