cfg80211: bugfix in regulatory user hint process
authorInbal Hacohen <Inbal.Hacohen@intel.com>
Wed, 12 Feb 2014 07:32:27 +0000 (09:32 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 19 Feb 2014 10:56:48 +0000 (11:56 +0100)
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>
net/wireless/reg.c

index 9b897fca7487dd4fe8d8364368e8516ab8f369c0..4c50c21d6f5201b12bdb0d891ddb967946b0790b 100644 (file)
@@ -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(&reg_timeout, msecs_to_jiffies(3142));