diff options
| author | Arik Nemtsov <arik@wizery.com> | 2014-05-11 11:50:44 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-05-21 09:15:18 +0200 |
| commit | 4d3df547e836f9a75b8de2b788449823c8db1d6a (patch) | |
| tree | 2bd16fc9f4a8b0cf64fb376a3ddfd516975d170f /net | |
| parent | 7406353d43c8e2faf478721e87aeb6f2f9685de0 (diff) | |
| download | linux-4d3df547e836f9a75b8de2b788449823c8db1d6a.tar.bz2 | |
cfg80211: don't set reg timeout for user-handled hint
Otherwise every "indoor" setting by usermode will cause a regdomain reset.
Acked-by: Luis R. Rodriguez <mcgrof@suse.com>
Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/reg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index e78f532aaa5b..558b0e3a02d8 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1876,7 +1876,8 @@ static void reg_process_hint(struct regulatory_request *reg_request) case NL80211_REGDOM_SET_BY_USER: treatment = reg_process_hint_user(reg_request); if (treatment == REG_REQ_IGNORE || - treatment == REG_REQ_ALREADY_SET) + treatment == REG_REQ_ALREADY_SET || + treatment == REG_REQ_USER_HINT_HANDLED) return; queue_delayed_work(system_power_efficient_wq, ®_timeout, msecs_to_jiffies(3142)); |