wl12xx: check the actual vif operstate in wl1271_dev_notify
authorEliad Peller <eliad@wizery.com>
Sun, 18 Dec 2011 18:25:45 +0000 (20:25 +0200)
committerLuciano Coelho <coelho@ti.com>
Tue, 20 Dec 2011 20:30:15 +0000 (22:30 +0200)
The current wl1271_dev_notify implementation sets the
new operstate to all associated stations (while only
a specific vif was changed).

Until we'll have a method to get the actual vif from
the given dev, check the current operstate of each vif.

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

index 0719fc82d55f0a9c29d2087febc6bc49b2d12799..d5f55a149de5e43216ad46c7ebf0d4825e9d0628 100644 (file)
@@ -450,7 +450,16 @@ static int wl1271_dev_notify(struct notifier_block *me, unsigned long what,
        if (wl->state == WL1271_STATE_OFF)
                goto out;
 
+       if (dev->operstate != IF_OPER_UP)
+               goto out;
+       /*
+        * The correct behavior should be just getting the appropriate wlvif
+        * from the given dev, but currently we don't have a mac80211
+        * interface for it.
+        */
        wl12xx_for_each_wlvif_sta(wl, wlvif) {
+               struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
+
                if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
                        continue;
 
@@ -458,7 +467,8 @@ static int wl1271_dev_notify(struct notifier_block *me, unsigned long what,
                if (ret < 0)
                        goto out;
 
-               wl1271_check_operstate(wl, wlvif, dev->operstate);
+               wl1271_check_operstate(wl, wlvif,
+                                      ieee80211_get_operstate(vif));
 
                wl1271_ps_elp_sleep(wl);
        }