X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=drivers%2Fnet%2Fwireless%2Fwl1251%2Fmain.c;h=243d8d8091d1829b9b4a285698ede4f630d2441b;hp=68c9743b4936e8baee76096207e87ab2e6ba3847;hb=874c7e69270485fac8f1558bd525223868352c99;hpb=313311f53baa2490af5c446c51c8304d1b9984cb

diff --git a/drivers/net/wireless/wl1251/main.c b/drivers/net/wireless/wl1251/main.c
index 68c9743b4936..243d8d8091d1 100644
--- a/drivers/net/wireless/wl1251/main.c
+++ b/drivers/net/wireless/wl1251/main.c
@@ -1194,6 +1194,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
 {
 	struct wl1251 *wl = hw->priv;
 	struct sk_buff *beacon, *skb;
+	bool do_join = false;
 	bool enable;
 	int ret;
 
@@ -1228,10 +1229,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
 			if (ret < 0)
 				goto out_sleep;
 
-			ret = wl1251_join(wl, wl->bss_type, wl->channel,
-					  wl->beacon_int, wl->dtim_period);
-			if (ret < 0)
-				goto out_sleep;
+			do_join = true;
 		}
 	}
 
@@ -1323,9 +1321,12 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
 		if (ret < 0)
 			goto out_sleep;
 
+		do_join = true;
+	}
+
+	if (do_join) {
 		ret = wl1251_join(wl, wl->bss_type, wl->channel,
 				  wl->beacon_int, wl->dtim_period);
-
 		if (ret < 0)
 			goto out_sleep;
 	}