diff options
author | Inbal Hacohen <Inbal.Hacohen@intel.com> | 2014-02-12 09:32:27 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-19 11:56:48 +0100 |
commit | 50c11eb9982554e9f99b7bab322c517cbe5ce1a1 (patch) | |
tree | c22392cc092ff637d2a47beecb7e137ca384b244 /net/wireless | |
parent | 1bf4bbb4024dcdab5e57634dd8ae1072d42a53ac (diff) | |
download | linux-stable-50c11eb9982554e9f99b7bab322c517cbe5ce1a1.tar.gz linux-stable-50c11eb9982554e9f99b7bab322c517cbe5ce1a1.tar.bz2 linux-stable-50c11eb9982554e9f99b7bab322c517cbe5ce1a1.zip |
cfg80211: bugfix in regulatory user hint process
After processing hint_user, we would want to schedule the
timeout work only if we are actually waiting to CRDA. This happens
when the status is not "IGNORE" nor "ALREADY_SET".
Signed-off-by: Inbal Hacohen <Inbal.Hacohen@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/reg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 9b897fca7487..4c50c21d6f52 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1700,7 +1700,7 @@ static void reg_process_hint(struct regulatory_request *reg_request) return; case NL80211_REGDOM_SET_BY_USER: treatment = reg_process_hint_user(reg_request); - if (treatment == REG_REQ_OK || + if (treatment == REG_REQ_IGNORE || treatment == REG_REQ_ALREADY_SET) return; schedule_delayed_work(®_timeout, msecs_to_jiffies(3142)); |