* [PATCH] cfg80211: don't WARN about two consecutive Country IE hint
@ 2014-12-02 7:53 Emmanuel Grumbach
2014-12-02 18:19 ` Luis R. Rodriguez
2014-12-12 12:29 ` Johannes Berg
0 siblings, 2 replies; 3+ messages in thread
From: Emmanuel Grumbach @ 2014-12-02 7:53 UTC (permalink / raw)
To: johannes; +Cc: mcgrof, linux-wireless, Emmanuel Grumbach, stable
This can happen and there is no point in added more
detection code lower in the stack. Catching these in one
single point (cfg80211) is enough. Stop WARNING about this
case.
This fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=89001
Cc: <stable@vger.kernel.org>
Fixes: 2f1c6c572d7b ("cfg80211: process non country IE conflicting first")
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
net/wireless/reg.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 8fe21c0..3e69554 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2047,11 +2047,8 @@ __reg_process_hint_country_ie(struct wiphy *wiphy,
return REG_REQ_IGNORE;
return REG_REQ_ALREADY_SET;
}
- /*
- * Two consecutive Country IE hints on the same wiphy.
- * This should be picked up early by the driver/stack
- */
- if (WARN_ON(regdom_changes(country_ie_request->alpha2)))
+
+ if (regdom_changes(country_ie_request->alpha2))
return REG_REQ_OK;
return REG_REQ_ALREADY_SET;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] cfg80211: don't WARN about two consecutive Country IE hint
2014-12-02 7:53 [PATCH] cfg80211: don't WARN about two consecutive Country IE hint Emmanuel Grumbach
@ 2014-12-02 18:19 ` Luis R. Rodriguez
2014-12-12 12:29 ` Johannes Berg
1 sibling, 0 replies; 3+ messages in thread
From: Luis R. Rodriguez @ 2014-12-02 18:19 UTC (permalink / raw)
To: Emmanuel Grumbach; +Cc: johannes, linux-wireless, stable
On Tue, Dec 02, 2014 at 09:53:25AM +0200, Emmanuel Grumbach wrote:
> This can happen and there is no point in added more
> detection code lower in the stack. Catching these in one
> single point (cfg80211) is enough. Stop WARNING about this
> case.
>
> This fixes:
> https://bugzilla.kernel.org/show_bug.cgi?id=89001
>
> Cc: <stable@vger.kernel.org>
> Fixes: 2f1c6c572d7b ("cfg80211: process non country IE conflicting first")
> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Acked-by: Luis R. Rodriguez <mcgrof@suse.com>
Luis
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] cfg80211: don't WARN about two consecutive Country IE hint
2014-12-02 7:53 [PATCH] cfg80211: don't WARN about two consecutive Country IE hint Emmanuel Grumbach
2014-12-02 18:19 ` Luis R. Rodriguez
@ 2014-12-12 12:29 ` Johannes Berg
1 sibling, 0 replies; 3+ messages in thread
From: Johannes Berg @ 2014-12-12 12:29 UTC (permalink / raw)
To: Emmanuel Grumbach; +Cc: mcgrof, linux-wireless, stable
On Tue, 2014-12-02 at 09:53 +0200, Emmanuel Grumbach wrote:
> This can happen and there is no point in added more
> detection code lower in the stack. Catching these in one
> single point (cfg80211) is enough. Stop WARNING about this
> case.
Applied.
johannes
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-12-12 12:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-02 7:53 [PATCH] cfg80211: don't WARN about two consecutive Country IE hint Emmanuel Grumbach
2014-12-02 18:19 ` Luis R. Rodriguez
2014-12-12 12:29 ` Johannes Berg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.