summaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorSam Leffler <sleffler@chromium.org>2012-10-11 21:03:35 -0700
committerJohannes Berg <johannes.berg@intel.com>2012-10-18 09:01:53 +0200
commitcd2bb512cda58f1efb922ad6dc29013ea5d5d9d0 (patch)
tree68d6ca0c3bed7979f578b3b554b2c8e6b668c32a /net/mac80211/main.c
parent15d6030b4bec618742b8b9ccae9209c8f9e4a916 (diff)
downloadblackbird-op-linux-cd2bb512cda58f1efb922ad6dc29013ea5d5d9d0.tar.gz
blackbird-op-linux-cd2bb512cda58f1efb922ad6dc29013ea5d5d9d0.zip
mac80211: add support for tx to abort low priority scan requests
Use NL80211_SCAN_FLAG_LOW_PRIORITY flag in mac80211's scan state machine to prematurely terminate scan operations if outbound traffic collides. This is useful for marking background scans so they don't affect throughput. Signed-off-by: Sam Leffler <sleffler@chromium.org> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> [set feature flag only if software scan is used] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 931f14f3281f..ba5a23249771 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -602,6 +602,9 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
NL80211_FEATURE_SAE |
NL80211_FEATURE_HT_IBSS;
+ if (!ops->hw_scan)
+ wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN;
+
if (!ops->set_key)
wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
OpenPOWER on IntegriCloud