Commit c037b836 authored by John W. Linville's avatar John W. Linville

Revert "mac80211: Do not scan for IBSS merge with a fixed BSSID."

This reverts commit f1e3be15.

Johannes Berg <> thinks that this patch is
incorrect.  I'll defer to his judgment.
Signed-off-by: default avatarJohn W. Linville <>
parent 41b2d627
......@@ -655,15 +655,14 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
if (ieee80211_sta_active_ibss(sdata))
if (ifibss->fixed_bssid)
if (ifibss->fixed_channel)
printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other "
"IBSS networks with same SSID (merge)\n", sdata->name);
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)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment