Skip to content

Commit

Permalink
cfg80211: force last_request to be set for OLD_REG if regdom is EU
Browse files Browse the repository at this point in the history
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: Quentin Armitage <Quentin@armitage.org.uk>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Luis R. Rodriguez authored and John W. Linville committed Mar 28, 2009
1 parent 98dfaa5 commit 2e097dc
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions net/wireless/reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -2135,11 +2135,14 @@ int regulatory_init(void)
/*
* The old code still requests for a new regdomain and if
* you have CRDA you get it updated, otherwise you get
* stuck with the static values. We ignore "EU" code as
* that is not a valid ISO / IEC 3166 alpha2
* stuck with the static values. Since "EU" is not a valid
* 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
cfg80211_regdomain = cfg80211_world_regdom;

Expand Down

0 comments on commit 2e097dc

Please sign in to comment.