diff options
| author | John W. Linville | 2012-01-30 15:28:11 -0500 |
|---|---|---|
| committer | John W. Linville | 2012-01-30 15:28:11 -0500 |
| commit | c037b8367c7e2b775a99d74037f5df014d2fbf06 (patch) | |
| tree | 7355a2162d6b8ac7de1cc3cb29e34aec723a68b1 /net/mac80211 | |
| parent | 41b2d62702730b0c6bc5a40722e423bb0338311a (diff) | |
Revert "mac80211: Do not scan for IBSS merge with a fixed BSSID."
This reverts commit f1e3be1561c43b6bbe2426e34849fb1486dc313b.
Johannes Berg <johannes@sipsolutions.net> thinks that this patch is
incorrect. I'll defer to his judgment.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/ibss.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 93b3c7298be3..d38baa41cf6c 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -655,15 +655,14 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata) if (ieee80211_sta_active_ibss(sdata)) return; - if (ifibss->fixed_bssid) + if (ifibss->fixed_channel) return; printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other " "IBSS networks with same SSID (merge)\n", sdata->name); ieee80211_request_internal_scan(sdata, - ifibss->ssid, ifibss->ssid_len, - ifibss->fixed_channel ? ifibss->channel : NULL); + ifibss->ssid, ifibss->ssid_len, NULL); } static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata) |