---

yaml --- r: 291281 b: refs/heads/master c: 8a6a84a h: refs/heads/master i: 291279: 4ccacb4 v: v3
git-mirror · Mar 5, 2012 · d130b41 · d130b41
1 parent 7dc7783
commit d130b41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 349345a4ec631cd98767b58b065535dd2278697c
+refs/heads/master: 8a6a84a471f7de1845174d1dd66b35074d9d9398
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -3901,7 +3901,6 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
 
 			/* 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 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
 				}
 
 				wl1271_unjoin(wl, wlvif);
-				if (!(conf_flags & IEEE80211_CONF_IDLE))
+				if (!bss_conf->idle)
 					wl12xx_start_dev(wl, wlvif);
 			}
 		}