From a4c9e25b0ff0803e8b94a328560cf697e425e21d Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 20 Mar 2009 23:53:04 -0400 Subject: [PATCH] --- yaml --- r: 136173 b: refs/heads/master c: 2e097dc65673ed421bbc2e49f52c125aa43a8ee6 h: refs/heads/master i: 136171: 0ab892d264b785dd694b7938fb3e006670b51baa v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c934536c9287..bc5a75dc9944 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98dfaa577855a551e798e3a99b934386698d2026 +refs/heads/master: 2e097dc65673ed421bbc2e49f52c125aa43a8ee6 diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index eb8b8ed16155..ead9dccb5475 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -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;