From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 13 Aug 2013 10:35:04 +0000 (+0000)
Subject: mac80211: merge upstream patch to suppress unnecessary ad-hoc mode scan with fixed... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=b96d86df655bc97408c40335c5d7597923b9bf15

mac80211: merge upstream patch to suppress unnecessary ad-hoc mode scan with fixed-freq, fixed-bssid

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37764
---

diff --git a/package/kernel/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch
index 55449db40f..4ec4423c6b 100644
--- a/package/kernel/mac80211/patches/300-pending_work.patch
+++ b/package/kernel/mac80211/patches/300-pending_work.patch
@@ -2354,3 +2354,23 @@
  	if (len > size)
  		len = size;
  
+--- a/net/mac80211/ibss.c
++++ b/net/mac80211/ibss.c
+@@ -792,6 +792,17 @@ static void ieee80211_sta_find_ibss(stru
+ 		return;
+ 	}
+ 
++	/* if a fixed bssid and a fixed freq have been provided create the IBSS
++	 * directly and do not waste time scanning
++	 */
++	if (ifibss->fixed_bssid && ifibss->fixed_channel) {
++		sdata_info(sdata, "Created IBSS using preconfigured BSSID %pM\n",
++			   bssid);
++		ieee80211_sta_create_ibss(sdata);
++		return;
++	}
++
++
+ 	ibss_dbg(sdata, "sta_find_ibss: did not try to join ibss\n");
+ 
+ 	/* Selected IBSS not found in current scan results - try to scan */