From: Alina Friedrichsen Date: Tue, 6 Jan 2009 02:08:10 +0000 (+0100) Subject: mac80211: Don't merge if BSSID is set manually X-Git-Tag: v2.6.30-rc1~662^2~836^2~203 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65f0e6a36e25fbfa6adf706d9c53bf64b13096eb;p=profile%2Fivi%2Fkernel-x86-ivi.git mac80211: Don't merge if BSSID is set manually If you set a fixed BSSID manually, you never want that the driver change it back, or your ad-hoc mesh network will break into peaces. So don't do it. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville --- diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 563ceb4..2db5660 100644 --- a/net/mac80211/mlme.c +++ b/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 &&