| Message ID | 1417506805-20361-1-git-send-email-emmanuel.grumbach@intel.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }
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(-)