diff options
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r-- | net/mac80211/ibss.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index c585fced8584..ba752362b2b2 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c | |||
@@ -488,7 +488,9 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata) | |||
488 | printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other " | 488 | printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other " |
489 | "IBSS networks with same SSID (merge)\n", sdata->name); | 489 | "IBSS networks with same SSID (merge)\n", sdata->name); |
490 | 490 | ||
491 | ieee80211_request_internal_scan(sdata, ifibss->ssid, ifibss->ssid_len); | 491 | ieee80211_request_internal_scan(sdata, |
492 | ifibss->ssid, ifibss->ssid_len, | ||
493 | ifibss->fixed_channel ? ifibss->channel : NULL); | ||
492 | } | 494 | } |
493 | 495 | ||
494 | static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata) | 496 | static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata) |
@@ -595,8 +597,9 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata) | |||
595 | printk(KERN_DEBUG "%s: Trigger new scan to find an IBSS to " | 597 | printk(KERN_DEBUG "%s: Trigger new scan to find an IBSS to " |
596 | "join\n", sdata->name); | 598 | "join\n", sdata->name); |
597 | 599 | ||
598 | ieee80211_request_internal_scan(sdata, ifibss->ssid, | 600 | ieee80211_request_internal_scan(sdata, |
599 | ifibss->ssid_len); | 601 | ifibss->ssid, ifibss->ssid_len, |
602 | ifibss->fixed_channel ? ifibss->channel : NULL); | ||
600 | } else { | 603 | } else { |
601 | int interval = IEEE80211_SCAN_INTERVAL; | 604 | int interval = IEEE80211_SCAN_INTERVAL; |
602 | 605 | ||