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)