wl12xx: check the vif's operstate after join

When resuming while connected (without wowlan), the interface
is already IF_OPER_UP, so we won't get the notifier callback,
and hence never complete the association (from wl12xx perspective)

This situation, among other potential problems, prevents the
station from entering psm.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 00ee01e7d4a40538f8b78085148d225f893ccc54..8e2f560812d4f1e56fd066e1cf0c5988ba857114 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -394,6 +394,22 @@ static struct platform_device wl1271_device = {
 static DEFINE_MUTEX(wl_list_mutex);
 static LIST_HEAD(wl_list);
 
+static int wl1271_check_operstate(struct wl1271 *wl, unsigned char operstate)
+{
+       int ret;
+       if (operstate != IF_OPER_UP)
+               return 0;
+
+       if (test_and_set_bit(WL1271_FLAG_STA_STATE_SENT, &wl->flags))
+               return 0;
+
+       ret = wl1271_cmd_set_sta_state(wl);
+       if (ret < 0)
+               return ret;
+
+       wl1271_info("Association completed.");
+       return 0;
+}
 static int wl1271_dev_notify(struct notifier_block *me, unsigned long what,
                             void *arg)
 {
@@ -443,11 +459,7 @@ static int wl1271_dev_notify(struct notifier_block *me, unsigned long what,
        if (ret < 0)
                goto out;
 
-       if ((dev->operstate == IF_OPER_UP) &&
-           !test_and_set_bit(WL1271_FLAG_STA_STATE_SENT, &wl->flags)) {
-               wl1271_cmd_set_sta_state(wl);
-               wl1271_info("Association completed.");
-       }
+       wl1271_check_operstate(wl, dev->operstate);
 
        wl1271_ps_elp_sleep(wl);
 
@@ -3217,6 +3229,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
                        wl1271_warning("cmd join failed %d", ret);
                        goto out;
                }
+               wl1271_check_operstate(wl, ieee80211_get_operstate(vif));
        }
 
 out: