From: Arik Nemtsov <arik@wizery.com>
Date: Sun, 11 May 2014 08:50:44 +0000 (+0300)
Subject: cfg80211: don't set reg timeout for user-handled hint
X-Git-Tag: v3.16-rc1~27^2~122^2^2~17^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4d3df547e836f9a75b8de2b788449823c8db1d6a;p=~emulex%2Finfiniband.git

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>
---

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index e78f532aaa5..558b0e3a02d 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,
 				   &reg_timeout, msecs_to_jiffies(3142));