---

yaml --- r: 184093 b: refs/heads/master c: 641eabb h: refs/heads/master i: 184091: 70ab489 v: v3
git-mirror · Feb 8, 2010 · 3cab64b · 3cab64b
1 parent 4e1fcc0
commit 3cab64b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 349e6b7289f8a3d3d5d3b859e00b41f27d1211df
+refs/heads/master: 641eabb0a3717020d1a93d3f91493ab0d826c910
diff --git a/trunk/drivers/net/wireless/ath/regd.c b/trunk/drivers/net/wireless/ath/regd.c
@@ -110,8 +110,9 @@ static const struct ieee80211_regdomain ath_world_regdom_67_68_6A = {
 
 static inline bool is_wwr_sku(u16 regd)
 {
-	return ((regd & WORLD_SKU_MASK) == WORLD_SKU_PREFIX) ||
-		(regd == WORLD);
+	return ((regd & COUNTRY_ERD_FLAG) != COUNTRY_ERD_FLAG) &&
+		(((regd & WORLD_SKU_MASK) == WORLD_SKU_PREFIX) ||
+		(regd == WORLD));
 }
 
 static u16 ath_regd_get_eepromRD(struct ath_regulatory *reg)