diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-08-13 10:35:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-08-13 10:35:04 +0000 |
| commit | ebedc0094bfa1b56975d1d2192cf164589fd812f (patch) | |
| tree | 71a51c655fb3b1ef5b57ae2ac8c19dd38f69dfe0 /package | |
| parent | 8f544d257d92f5911fc08d6d6d24a436a08fc5e4 (diff) | |
| download | master-187ad058-ebedc0094bfa1b56975d1d2192cf164589fd812f.tar.gz master-187ad058-ebedc0094bfa1b56975d1d2192cf164589fd812f.tar.bz2 master-187ad058-ebedc0094bfa1b56975d1d2192cf164589fd812f.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37764 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/kernel/mac80211/patches/300-pending_work.patch | 20 |
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 */ |