Commit 70dcec5a authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg

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: 2f1c6c57 ("cfg80211: process non country IE conflicting first")
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 722ddb0d
...@@ -1989,11 +1989,8 @@ __reg_process_hint_country_ie(struct wiphy *wiphy, ...@@ -1989,11 +1989,8 @@ __reg_process_hint_country_ie(struct wiphy *wiphy,
return REG_REQ_IGNORE; return REG_REQ_IGNORE;
return REG_REQ_ALREADY_SET; return REG_REQ_ALREADY_SET;
} }
/*
* Two consecutive Country IE hints on the same wiphy. if (regdom_changes(country_ie_request->alpha2))
* This should be picked up early by the driver/stack
*/
if (WARN_ON(regdom_changes(country_ie_request->alpha2)))
return REG_REQ_OK; return REG_REQ_OK;
return REG_REQ_ALREADY_SET; return REG_REQ_ALREADY_SET;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment