43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
|
From e95a7085483366d52dd93b9fe8258ea77b99b89a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
||
|
|
Date: Tue, 2 Dec 2014 09:53:25 +0200
|
||
|
|
Subject: [PATCH] cfg80211: don't WARN about two consecutive Country IE hint
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
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 b725a31a4751..695f12b2c176 100644
|
||
|
|
--- a/net/wireless/reg.c
|
||
|
|
+++ b/net/wireless/reg.c
|
||
|
|
@@ -1839,11 +1839,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;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.1.0
|
||
|
|
|