diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-12-02 10:53:25 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-01-15 13:44:04 +0300 |
| commit | 06f863df73d6e0b7a2f1082fecf81a364ce7d830 (patch) | |
| tree | 77b6b4aca930b086ca94638eb48df70801e8bcac /net/wireless/reg.c | |
| parent | e5f0456765c5226bd2a42ea9e763738f64e88bb7 (diff) | |
| download | linux-06f863df73d6e0b7a2f1082fecf81a364ce7d830.tar.xz | |
cfg80211: don't WARN about two consecutive Country IE hint
commit 70dcec5a488a7b81779190ac8089475fe4b8b962 upstream.
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
Fixes: 2f1c6c572d7b ("cfg80211: process non country IE conflicting first")
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index ff7ffeb7947a..20ccc79d53a2 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1802,11 +1802,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; } |