|
|
@@ -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 ®DomainPairs[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;
|
|
|
}
|