---

yaml --- r: 183387 b: refs/heads/master c: 8f648c0 h: refs/heads/master i: 183385: 109dadd 183383: c2180a6 v: v3
git-mirror · Dec 28, 2009 · dec96df · dec96df
1 parent a314ec3
commit dec96df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04477bf095afd008b73717f7a4ea1fdf18b1b5e2
+refs/heads/master: 8f648c00039a42e67a9dff034c77d41502dab1f3
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1223,7 +1223,7 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
 		if (conf->flags & IEEE80211_CONF_IDLE &&
 		    test_bit(WL1271_FLAG_JOINED, &wl->flags))
 			wl1271_unjoin_channel(wl);
-		else
+		else if (!(conf->flags & IEEE80211_CONF_IDLE))
 			wl1271_join_channel(wl, channel);
 
 		if (conf->flags & IEEE80211_CONF_IDLE) {