---

yaml
---
r: 279359
b: refs/heads/master
c: 6ab7091
h: refs/heads/master
i:
  279357: dc3be88
  279355: fa7aa5d
  279351: 5d67936
  279343: c8ce8b2
  279327: ac443ca
  279295: 3a59d7f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b890f4c363ebdc9c38d7f1ec91e9ec0976c4fb6a
+refs/heads/master: 6ab70916939f055d9aaa9acc28a3a5bdfe9649f0

trunk/drivers/net/wireless/wl12xx/main.c

@@ -450,15 +450,25 @@ 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;
 
 		ret = wl1271_ps_elp_wakeup(wl);
 		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);
 	}