aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-08-13 10:35:04 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-08-13 10:35:04 +0000
commitead5aa354c823d2a25e94ed501204bdab32b0a74 (patch)
treeec4a099a9e7c28abe3e39791261a8105532e9e58 /package/kernel/mac80211
parent3ead1e058ce0a7836650e61941d3f5f0850d3e50 (diff)
downloadupstream-ead5aa354c823d2a25e94ed501204bdab32b0a74.tar.gz
upstream-ead5aa354c823d2a25e94ed501204bdab32b0a74.tar.bz2
upstream-ead5aa354c823d2a25e94ed501204bdab32b0a74.zip
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
Diffstat (limited to 'package/kernel/mac80211')
-rw-r--r--package/kernel/mac80211/patches/300-pending_work.patch20
1 files changed, 20 insertions, 0 deletions
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 */