1 --- a/drivers/net/wireless/ath/ath.h
2 +++ b/drivers/net/wireless/ath/ath.h
3 @@ -72,7 +72,6 @@ struct ath_regulatory {
9 struct reg_dmn_pair_mapping *regpair;
11 --- a/drivers/net/wireless/ath/ath9k/hw.c
12 +++ b/drivers/net/wireless/ath/ath9k/hw.c
13 @@ -2047,11 +2047,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw
14 eeval = ah->eep_ops->get_eeprom(ah, EEP_REG_0);
15 regulatory->current_rd = eeval;
17 - eeval = ah->eep_ops->get_eeprom(ah, EEP_REG_1);
18 - if (AR_SREV_9285_12_OR_LATER(ah))
19 - eeval |= AR9285_RDEXT_DEFAULT;
20 - regulatory->current_rd_ext = eeval;
22 if (ah->opmode != NL80211_IFTYPE_AP &&
23 ah->hw_version.subvendorid == AR_SUBVENDOR_ID_NEW_A) {
24 if (regulatory->current_rd == 0x64 ||
25 --- a/drivers/net/wireless/ath/carl9170/main.c
26 +++ b/drivers/net/wireless/ath/carl9170/main.c
27 @@ -1912,7 +1912,6 @@ static int carl9170_parse_eeprom(struct
28 ar->hw->channel_change_time = 80 * 1000;
30 regulatory->current_rd = le16_to_cpu(ar->eeprom.reg_domain[0]);
31 - regulatory->current_rd_ext = le16_to_cpu(ar->eeprom.reg_domain[1]);
33 /* second part of wiphy init */
34 SET_IEEE80211_PERM_ADDR(ar->hw, ar->eeprom.mac_address);