4 files changed, 11 insertions, 11 deletions

diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index b59cfbe0276b..2f4f25188cd1 100644
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -63,7 +63,7 @@ enum ath_bus_type {
 };
 
 struct reg_dmn_pair_mapping {
-        u16 regDmnEnum;
+        u16 reg_domain;
         u16 reg_5ghz_ctl;
         u16 reg_2ghz_ctl;
 };
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 1c305b10e477..5c5860ef36bd 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -1648,9 +1648,9 @@ static void ath10k_regd_update(struct ath10k *ar)
         /* Target allows setting up per-band regdomain but ath_common provides
          * a combined one only */
         ret = ath10k_wmi_pdev_set_regdomain(ar,
-                                            regpair->regDmnEnum,
-                                            regpair->regDmnEnum, /* 2ghz */
-                                            regpair->regDmnEnum, /* 5ghz */
+                                            regpair->reg_domain,
+                                            regpair->reg_domain, /* 2ghz */
+                                            regpair->reg_domain, /* 5ghz */
                                             regpair->reg_2ghz_ctl,
                                             regpair->reg_5ghz_ctl);
         if (ret)
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index 4f16d79c9eb1..8b4ce28e3ce8 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -914,7 +914,7 @@ ath6kl_get_regpair(u16 regdmn)
                 return NULL;
 
         for (i = 0; i < ARRAY_SIZE(regDomainPairs); i++) {
-                if (regDomainPairs[i].regDmnEnum == regdmn)
+                if (regDomainPairs[i].reg_domain == regdmn)
                         return &regDomainPairs[i];
         }
 
@@ -954,7 +954,7 @@ static void ath6kl_wmi_regdomain_event(struct wmi *wmi, u8 *datap, int len)
                 country = ath6kl_regd_find_country_by_rd((u16) reg_code);
                 if (regpair)
                         ath6kl_dbg(ATH6KL_DBG_WMI, "Regpair used: 0x%0x\n",
-                                   regpair->regDmnEnum);
+                                   regpair->reg_domain);
                 else
                         ath6kl_warn("Regpair not found reg_code 0x%0x\n",
                                     reg_code);
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index e5e905910db4..415393dfb6fc 100644
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -222,7 +222,7 @@ static const struct ieee80211_regdomain *ath_default_world_regdomain(void)
 static const struct
 ieee80211_regdomain *ath_world_regdomain(struct ath_regulatory *reg)
 {
-        switch (reg->regpair->regDmnEnum) {
+        switch (reg->regpair->reg_domain) {
         case 0x60:
         case 0x61:
         case 0x62:
@@ -431,7 +431,7 @@ static void ath_reg_apply_world_flags(struct wiphy *wiphy,
                                       enum nl80211_reg_initiator initiator,
                                       struct ath_regulatory *reg)
 {
-        switch (reg->regpair->regDmnEnum) {
+        switch (reg->regpair->reg_domain) {
         case 0x60:
         case 0x63:
         case 0x66:
@@ -560,7 +560,7 @@ static bool ath_regd_is_eeprom_valid(struct ath_regulatory *reg)
                         printk(KERN_DEBUG "ath: EEPROM indicates we "
                                "should expect a direct regpair map\n");
                 for (i = 0; i < ARRAY_SIZE(regDomainPairs); i++)
-                        if (regDomainPairs[i].regDmnEnum == rd)
+                        if (regDomainPairs[i].reg_domain == rd)
                                 return true;
         }
         printk(KERN_DEBUG
@@ -617,7 +617,7 @@ ath_get_regpair(int regdmn)
         if (regdmn == NO_ENUMRD)
                 return NULL;
         for (i = 0; i < ARRAY_SIZE(regDomainPairs); i++) {
-                if (regDomainPairs[i].regDmnEnum == regdmn)
+                if (regDomainPairs[i].reg_domain == regdmn)
                         return &regDomainPairs[i];
         }
         return NULL;
@@ -741,7 +741,7 @@ static int __ath_regd_init(struct ath_regulatory *reg)
         printk(KERN_DEBUG "ath: Country alpha2 being used: %c%c\n",
                 reg->alpha2[0], reg->alpha2[1]);
         printk(KERN_DEBUG "ath: Regpair used: 0x%0x\n",
-                reg->regpair->regDmnEnum);
+                reg->regpair->reg_domain);
 
         return 0;
 }