summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-12-02 09:53:25 +0200
committerJohannes Berg <johannes.berg@intel.com>2014-12-12 13:29:02 +0100
commit70dcec5a488a7b81779190ac8089475fe4b8b962 (patch)
treea887e6243a6e48b686b5cbb28eba8f3eb21a0d0e /net
parent722ddb0dab29b666881d74067c2b92d42074351f (diff)
downloadlinux-70dcec5a488a7b81779190ac8089475fe4b8b962.tar.bz2
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> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/reg.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 7ddd16a51adf..c9f5ad5d5d94 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1989,11 +1989,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;
}