Commit 2e097dc6 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville

cfg80211: force last_request to be set for OLD_REG if regdom is EU

Although EU is a bogus alpha2 we need to process the send request
as our code depends on last_request being set.

Cc: stable@kernel.org
Reported-by: default avatarQuentin Armitage <Quentin@armitage.org.uk>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 98dfaa57
...@@ -2135,10 +2135,13 @@ int regulatory_init(void) ...@@ -2135,10 +2135,13 @@ int regulatory_init(void)
/* /*
* The old code still requests for a new regdomain and if * The old code still requests for a new regdomain and if
* you have CRDA you get it updated, otherwise you get * you have CRDA you get it updated, otherwise you get
* stuck with the static values. We ignore "EU" code as * stuck with the static values. Since "EU" is not a valid
* that is not a valid ISO / IEC 3166 alpha2 * ISO / IEC 3166 alpha2 code we can't expect userpace to
* give us a regulatory domain for it. We need last_request
* iniitalized though so lets just send a request which we
* know will be ignored... this crap will be removed once
* OLD_REG dies.
*/ */
if (ieee80211_regdom[0] != 'E' || ieee80211_regdom[1] != 'U')
err = regulatory_hint_core(ieee80211_regdom); err = regulatory_hint_core(ieee80211_regdom);
#else #else
cfg80211_regdomain = cfg80211_world_regdom; cfg80211_regdomain = cfg80211_world_regdom;
......
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