---

yaml --- r: 290570 b: refs/heads/master c: 7db4ee6 h: refs/heads/master v: v3
git-mirror · Feb 15, 2012 · a4b9971 · a4b9971
1 parent 608cbb7
commit a4b9971
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c882fa47502ef201e0533fc7cc21b097f4bcdca
+refs/heads/master: 7db4ee6d0a932bb95f839d9b427899b74139a8d5
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -3665,7 +3665,8 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
 		wlvif->rssi_thold = bss_conf->cqm_rssi_thold;
 	}
 
-	if (changed & BSS_CHANGED_BSSID)
+	if (changed & BSS_CHANGED_BSSID &&
+	    (is_ibss || bss_conf->assoc))
 		if (!is_zero_ether_addr(bss_conf->bssid)) {
 			ret = wl12xx_cmd_build_null_data(wl, wlvif);
 			if (ret < 0)