From 1693a402240c016c21fd5665f880d0993c985dfb Mon Sep 17 00:00:00 2001
From: Bob Copeland <me@bobcopeland.com>
Date: Thu, 12 Feb 2009 13:38:55 -0500
Subject: [PATCH] --- yaml --- r: 134847 b: refs/heads/master c:
 d0f48f9d1fa9ad01effdf280cda944c6eb518f59 h: refs/heads/master i:   134845:
 09c53e9f485603e9f42a7e60c518cddeed8942f6   134843:
 522b5c8f3bcd4079524f451dfddcaeb27259661a   134839:
 d7a605713ba0a4b8a793ed9a1a656888ff299de4   134831:
 109e8c532d0ed9ca50545f39887843b97cc737f5   134815:
 e856dedeb12a32b8d83becc65e5a51a8027ae5ce   134783:
 a3274fc529f412c7a82db8e84904e319e969cbd8 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/net/wireless/ath9k/regd.c | 11 +++++++++--
 trunk/drivers/net/wireless/ath9k/regd.h |  5 -----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 9f026ed3c7d8..d48148a63764 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e775aaf07a72eafdb352a984d820612dd76eab8c
+refs/heads/master: d0f48f9d1fa9ad01effdf280cda944c6eb518f59
diff --git a/trunk/drivers/net/wireless/ath9k/regd.c b/trunk/drivers/net/wireless/ath9k/regd.c
index 99994626081d..979351540e69 100644
--- a/trunk/drivers/net/wireless/ath9k/regd.c
+++ b/trunk/drivers/net/wireless/ath9k/regd.c
@@ -106,6 +106,12 @@ static const struct ieee80211_regdomain ath9k_world_regdom_67_68_6A = {
 	}
 };
 
+static inline bool is_wwr_sku(u16 regd)
+{
+	return ((regd & WORLD_SKU_MASK) == WORLD_SKU_PREFIX) ||
+		(regd == WORLD);
+}
+
 static u16 ath9k_regd_get_eepromRD(struct ath_hw *ah)
 {
 	return ah->regulatory.current_rd & ~WORLDWIDE_ROAMING_FLAG;
@@ -118,7 +124,7 @@ u16 ath9k_regd_get_rd(struct ath_hw *ah)
 
 bool ath9k_is_world_regd(struct ath_hw *ah)
 {
-	return isWwrSKU(ah);
+	return is_wwr_sku(ath9k_regd_get_eepromRD(ah));
 }
 
 const struct ieee80211_regdomain *ath9k_default_world_regdomain(void)
@@ -463,7 +469,8 @@ u32 ath9k_regd_get_ctl(struct ath_hw *ah, struct ath9k_channel *chan)
 	u32 ctl = NO_CTL;
 
 	if (!ah->regulatory.regpair ||
-	    (ah->regulatory.country_code == CTRY_DEFAULT && isWwrSKU(ah))) {
+	    (ah->regulatory.country_code == CTRY_DEFAULT &&
+	     is_wwr_sku(ath9k_regd_get_eepromRD(ah)))) {
 		if (IS_CHAN_B(chan))
 			ctl = SD_NO_CTL | CTL_11B;
 		else if (IS_CHAN_G(chan))
diff --git a/trunk/drivers/net/wireless/ath9k/regd.h b/trunk/drivers/net/wireless/ath9k/regd.h
index 53a9f4627f3c..8f0bfcc907b5 100644
--- a/trunk/drivers/net/wireless/ath9k/regd.h
+++ b/trunk/drivers/net/wireless/ath9k/regd.h
@@ -20,11 +20,6 @@
 #define COUNTRY_ERD_FLAG        0x8000
 #define WORLDWIDE_ROAMING_FLAG  0x4000
 
-#define isWwrSKU(_ah) \
-	(((ath9k_regd_get_eepromRD((_ah)) & WORLD_SKU_MASK) == \
-		WORLD_SKU_PREFIX) || \
-		(ath9k_regd_get_eepromRD(_ah) == WORLD))
-
 #define MULTI_DOMAIN_MASK 0xFF00
 
 #define WORLD_SKU_MASK          0x00F0