diff options
| author | Ben Greear <greearb@candelatech.com> | 2011-02-07 13:44:38 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-09 16:09:48 -0500 |
| commit | 59bdf3b0fe7a183f18ce94696259c4c76abb4568 (patch) | |
| tree | f78a9a59703b0e68156f2fce509b7c9e3a80ae70 /net/mac80211/main.c | |
| parent | 603b3eefb92e0886ed4dd5f73d4c07b304405b40 (diff) | |
mac80211: Ensure power-level set properly for scanning.
My previous patch to optimize scanning on operating channel
accidentally removed the code that would ensure power was
set to maximum for scanning.
This patch re-adds that functionality.
Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 86562ce99221..e7eb2cfaf400 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -199,7 +199,8 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) changed |= IEEE80211_CONF_CHANGE_SMPS; } - if (scan_chan) + if ((local->scanning & SCAN_SW_SCANNING) || + (local->scanning & SCAN_HW_SCANNING)) power = chan->max_power; else power = local->power_constr_level ? |