summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2012-02-02 17:44:55 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-02-06 14:55:51 -0500
commit885bd8eca6ac172e299750d99bd5c9fddbed89b9 (patch)
tree7ce2265d4738f6ea1f40f13d86d96c150bef73cf /net
parent3dc5e1751803e812806d7aa46150af92f91ef489 (diff)
downloadop-kernel-dev-885bd8eca6ac172e299750d99bd5c9fddbed89b9.zip
op-kernel-dev-885bd8eca6ac172e299750d99bd5c9fddbed89b9.tar.gz
mac80211: support hw scan while idle
Currently, mac80211 goes to idle-off before starting a scan. However, some devices that implement hw scan might not need going idle-off in order to perform a hw scan, and thus saving some energy and simplifying their state machine. (Note that this is also the case for sched scan - it currently doesn't make mac80211 go idle-off) Add a new flag to indicate support for hw scan while idle. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/debugfs.c2
-rw-r--r--net/mac80211/iface.c3
-rw-r--r--net/mac80211/main.c3
3 files changed, 7 insertions, 1 deletions
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index affe64b..483e96e 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -263,6 +263,8 @@ static ssize_t hwflags_read(struct file *file, char __user *user_buf,
sf += snprintf(buf + sf, mxln - sf, "AP_LINK_PS\n");
if (local->hw.flags & IEEE80211_HW_TX_AMPDU_SETUP_IN_HW)
sf += snprintf(buf + sf, mxln - sf, "TX_AMPDU_SETUP_IN_HW\n");
+ if (local->hw.flags & IEEE80211_HW_SCAN_WHILE_IDLE)
+ sf += snprintf(buf + sf, mxln - sf, "SCAN_WHILE_IDLE\n");
rv = simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf));
kfree(buf);
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 19f0818..6b3cd65 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1332,7 +1332,8 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
wk->sdata->vif.bss_conf.idle = false;
}
- if (local->scan_sdata) {
+ if (local->scan_sdata &&
+ !(local->hw.flags & IEEE80211_HW_SCAN_WHILE_IDLE)) {
scanning = true;
local->scan_sdata->vif.bss_conf.idle = false;
}
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 362e89d..831a5bd 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -697,6 +697,9 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
)
return -EINVAL;
+ if ((hw->flags & IEEE80211_HW_SCAN_WHILE_IDLE) && !local->ops->hw_scan)
+ return -EINVAL;
+
if (hw->max_report_rates == 0)
hw->max_report_rates = hw->max_rates;
OpenPOWER on IntegriCloud