diff --git a/[refs] b/[refs]
index 098f5e6245d3..a3f99fb77b9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2354b9fdda6491c8476498b246ff7c48d324a07f
+refs/heads/master: fa287b8f291d79f080182eb353d1c1f4f374ae87
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
index 8a3549162999..a3529f56a3d6 100644
--- a/trunk/drivers/net/wireless/wl12xx/main.c
+++ b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -2266,19 +2266,21 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
 	    memcmp(wl->bssid, bss_conf->bssid, ETH_ALEN)) {
 		memcpy(wl->bssid, bss_conf->bssid, ETH_ALEN);
 
-		ret = wl1271_cmd_build_null_data(wl);
-		if (ret < 0)
-			goto out;
+		if (!is_zero_ether_addr(wl->bssid)) {
+			ret = wl1271_cmd_build_null_data(wl);
+			if (ret < 0)
+				goto out;
 
-		ret = wl1271_build_qos_null_data(wl);
-		if (ret < 0)
-			goto out;
+			ret = wl1271_build_qos_null_data(wl);
+			if (ret < 0)
+				goto out;
 
-		/* filter out all packets not from this BSSID */
-		wl1271_configure_filters(wl, 0);
+			/* filter out all packets not from this BSSID */
+			wl1271_configure_filters(wl, 0);
 
-		/* Need to update the BSSID (for filtering etc) */
-		do_join = true;
+			/* Need to update the BSSID (for filtering etc) */
+			do_join = true;
+		}
 	}
 
 	if ((changed & BSS_CHANGED_ASSOC)) {