---

yaml --- r: 134077 b: refs/heads/master c: 65f0e6a h: refs/heads/master i: 134075: 5a76ab0 v: v3
git-mirror · Jan 29, 2009 · 9347c87 · 9347c87
1 parent bc295d1
commit 9347c87
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 137f9f46a4edf8a937ffe9e3dba498b5cfaa1e5b
+refs/heads/master: 65f0e6a36e25fbfa6adf706d9c53bf64b13096eb
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
@@ -1644,6 +1644,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
 
 	/* check if we need to merge IBSS */
 	if (sdata->vif.type == NL80211_IFTYPE_ADHOC && beacon &&
+	    (!(sdata->u.sta.flags & IEEE80211_STA_BSSID_SET)) &&
 	    bss->capability & WLAN_CAPABILITY_IBSS &&
 	    bss->freq == local->oper_channel->center_freq &&
 	    elems->ssid_len == sdata->u.sta.ssid_len &&