ath: rename regulatory rules

Regulatory rule defines in regd.c are used not only by ath9k but also
ath10k driver (haven't test other drivers) and thus should be
renamed from ATH9K* to ATH*.

Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index e25bfdf..20f4f8e 100644 (file)
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -33,33 +33,33 @@ static int __ath_regd_init(struct ath_regulatory *reg);
  */
 
 /* Only these channels all allow active scan on all world regulatory domains */
-#define ATH9K_2GHZ_CH01_11     REG_RULE(2412-10, 2462+10, 40, 0, 20, 0)
+#define ATH_2GHZ_CH01_11       REG_RULE(2412-10, 2462+10, 40, 0, 20, 0)
 
 /* We enable active scan on these a case by case basis by regulatory domain */
-#define ATH9K_2GHZ_CH12_13     REG_RULE(2467-10, 2472+10, 40, 0, 20,\
+#define ATH_2GHZ_CH12_13       REG_RULE(2467-10, 2472+10, 40, 0, 20,\
                                         NL80211_RRF_NO_IR)
-#define ATH9K_2GHZ_CH14                REG_RULE(2484-10, 2484+10, 40, 0, 20,\
+#define ATH_2GHZ_CH14          REG_RULE(2484-10, 2484+10, 40, 0, 20,\
                                         NL80211_RRF_NO_IR | \
                                         NL80211_RRF_NO_OFDM)
 
 /* We allow IBSS on these on a case by case basis by regulatory domain */
-#define ATH9K_5GHZ_5150_5350   REG_RULE(5150-10, 5350+10, 80, 0, 30,\
+#define ATH_5GHZ_5150_5350     REG_RULE(5150-10, 5350+10, 80, 0, 30,\
                                         NL80211_RRF_NO_IR)
-#define ATH9K_5GHZ_5470_5850   REG_RULE(5470-10, 5850+10, 80, 0, 30,\
+#define ATH_5GHZ_5470_5850     REG_RULE(5470-10, 5850+10, 80, 0, 30,\
                                         NL80211_RRF_NO_IR)
-#define ATH9K_5GHZ_5725_5850   REG_RULE(5725-10, 5850+10, 80, 0, 30,\
+#define ATH_5GHZ_5725_5850     REG_RULE(5725-10, 5850+10, 80, 0, 30,\
                                         NL80211_RRF_NO_IR)
 
-#define ATH9K_2GHZ_ALL         ATH9K_2GHZ_CH01_11, \
-                               ATH9K_2GHZ_CH12_13, \
-                               ATH9K_2GHZ_CH14
+#define ATH_2GHZ_ALL           ATH_2GHZ_CH01_11, \
+                               ATH_2GHZ_CH12_13, \
+                               ATH_2GHZ_CH14
 
-#define ATH9K_5GHZ_ALL         ATH9K_5GHZ_5150_5350, \
-                               ATH9K_5GHZ_5470_5850
+#define ATH_5GHZ_ALL           ATH_5GHZ_5150_5350, \
+                               ATH_5GHZ_5470_5850
 
 /* This one skips what we call "mid band" */
-#define ATH9K_5GHZ_NO_MIDBAND  ATH9K_5GHZ_5150_5350, \
-                               ATH9K_5GHZ_5725_5850
+#define ATH_5GHZ_NO_MIDBAND    ATH_5GHZ_5150_5350, \
+                               ATH_5GHZ_5725_5850
 
 /* Can be used for:
  * 0x60, 0x61, 0x62 */
@@ -67,8 +67,8 @@ static const struct ieee80211_regdomain ath_world_regdom_60_61_62 = {
        .n_reg_rules = 5,
        .alpha2 =  "99",
        .reg_rules = {
-               ATH9K_2GHZ_ALL,
-               ATH9K_5GHZ_ALL,
+               ATH_2GHZ_ALL,
+               ATH_5GHZ_ALL,
        }
 };
 
@@ -77,9 +77,9 @@ static const struct ieee80211_regdomain ath_world_regdom_63_65 = {
        .n_reg_rules = 4,
        .alpha2 =  "99",
        .reg_rules = {
-               ATH9K_2GHZ_CH01_11,
-               ATH9K_2GHZ_CH12_13,
-               ATH9K_5GHZ_NO_MIDBAND,
+               ATH_2GHZ_CH01_11,
+               ATH_2GHZ_CH12_13,
+               ATH_5GHZ_NO_MIDBAND,
        }
 };
 
@@ -88,8 +88,8 @@ static const struct ieee80211_regdomain ath_world_regdom_64 = {
        .n_reg_rules = 3,
        .alpha2 =  "99",
        .reg_rules = {
-               ATH9K_2GHZ_CH01_11,
-               ATH9K_5GHZ_NO_MIDBAND,
+               ATH_2GHZ_CH01_11,
+               ATH_5GHZ_NO_MIDBAND,
        }
 };
 
@@ -98,8 +98,8 @@ static const struct ieee80211_regdomain ath_world_regdom_66_69 = {
        .n_reg_rules = 3,
        .alpha2 =  "99",
        .reg_rules = {
-               ATH9K_2GHZ_CH01_11,
-               ATH9K_5GHZ_ALL,
+               ATH_2GHZ_CH01_11,
+               ATH_5GHZ_ALL,
        }
 };
 
@@ -108,9 +108,9 @@ static const struct ieee80211_regdomain ath_world_regdom_67_68_6A_6C = {
        .n_reg_rules = 4,
        .alpha2 =  "99",
        .reg_rules = {
-               ATH9K_2GHZ_CH01_11,
-               ATH9K_2GHZ_CH12_13,
-               ATH9K_5GHZ_ALL,
+               ATH_2GHZ_CH01_11,
+               ATH_2GHZ_CH12_13,
+               ATH_5GHZ_ALL,
        }
 };