aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorAlina Friedrichsen <x-alina@gmx.net>2009-01-06 02:49:07 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:59:48 -0500
commit137f9f46a4edf8a937ffe9e3dba498b5cfaa1e5b (patch)
tree3abe98a9e560671f3d32f6a6c143761a9b596228 /net/mac80211
parent0efcdfd6ed4e7ac74c45e7c3218fd1a7416fdb3f (diff)
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 <x-alina@gmx.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mlme.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index f80dc253570..563ceb4d225 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);