From: Alina Friedrichsen Date: Tue, 6 Jan 2009 01:49:07 +0000 (+0100) Subject: mac80211: Don't scan if BSSID and channel are set manually X-Git-Tag: v2.6.30-rc1~662^2~836^2~204 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=137f9f46a4edf8a937ffe9e3dba498b5cfaa1e5b;p=profile%2Fivi%2Fkernel-x86-ivi.git mac80211: Don't scan if BSSID and channel are set manually If you set a fixed BSSID and channel it's not necessary to scan for neighbors to merge, because you really don't want to merge with it. 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 f80dc25..563ceb4 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2009,6 +2009,10 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata, if (ieee80211_sta_active_ibss(sdata)) return; + if ((sdata->u.sta.flags & IEEE80211_STA_BSSID_SET) && + (!(sdata->u.sta.flags & IEEE80211_STA_AUTO_CHANNEL_SEL))) + return; + printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other " "IBSS networks with same SSID (merge)\n", sdata->dev->name); ieee80211_request_scan(sdata, ifsta->ssid, ifsta->ssid_len);