[PATCH] cfg80211: bugfix in regulatory user hint process

[PATCH] cfg80211: bugfix in regulatory user hint process

[Emmanuel Grumbach]

From: Inbal Hacohen <Inbal.Hacohen@intel.com>

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>
---
 net/wireless/reg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index fa149ea..1301ada 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(&reg_timeout, msecs_to_jiffies(3142));
-- 
1.8.3.2

Re: [PATCH] cfg80211: bugfix in regulatory user hint process

[Johannes Berg]

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

Luis, does this seem right to you? I looked at it but wasn't _entirely_
sure.

johannes

> --- 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(&reg_timeout, msecs_to_jiffies(3142));

Re: [PATCH] cfg80211: bugfix in regulatory user hint process

[Luis R. Rodriguez]

On Wed, Feb 12, 2014 at 2:42 AM, Johannes Berg
<johannes@sipsolutions.net> wrote:
>> 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".
>
> Luis, does this seem right to you? I looked at it but wasn't _entirely_
> sure.

Looks good to me as well.

  Luis

Re: [PATCH] cfg80211: bugfix in regulatory user hint process

[Johannes Berg]

On Wed, 2014-02-12 at 09:32 +0200, Emmanuel Grumbach wrote:
> From: Inbal Hacohen <Inbal.Hacohen@intel.com>
> 
> 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".

Applied.

johannes