From 4ccfb9af6c693b922d08bfd00c34dd7e8fa9a07b Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 21 Oct 2008 11:08:27 +0200 Subject: [PATCH] --- yaml --- r: 121625 b: refs/heads/master c: ac9440a4e4b284d3469120f0e049dff7c73c72a4 h: refs/heads/master i: 121623: a4d669acc6b792ea8cf922b1cb8cf1f2a3b97cab v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0b35d0d84f60..d042a8a9bc00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6037d09e2b58e5483ab63f75d4d57ae70f9ae6a +refs/heads/master: ac9440a4e4b284d3469120f0e049dff7c73c72a4 diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index a78902d0d6c9..5dab72db54b9 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -791,7 +791,7 @@ int regulatory_init(void) * 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 */ - if (ieee80211_regdom[0] != 'E' && ieee80211_regdom[1] != 'U') + if (ieee80211_regdom[0] != 'E' || ieee80211_regdom[1] != 'U') err = __regulatory_hint(NULL, REGDOM_SET_BY_CORE, ieee80211_regdom, NULL); #else