From 9347c8743c11ea12027b2f2c7c440f97f3581191 Mon Sep 17 00:00:00 2001
From: Alina Friedrichsen <x-alina@gmx.net>
Date: Tue, 6 Jan 2009 03:08:10 +0100
Subject: [PATCH] --- yaml --- r: 134077 b: refs/heads/master c:
 65f0e6a36e25fbfa6adf706d9c53bf64b13096eb h: refs/heads/master i:   134075:
 5a76ab04b165e63136b60c561c954ad03eeca7e4 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 75b5d2f407dc..26514f40534e 100644
--- 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
index 563ceb4d2252..2db56605a2b6 100644
--- 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 &&