35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
--- a/drivers/net/wireless/ath/ath.h
|
|
+++ b/drivers/net/wireless/ath/ath.h
|
|
@@ -72,7 +72,6 @@ struct ath_regulatory {
|
|
u16 country_code;
|
|
u16 max_power_level;
|
|
u16 current_rd;
|
|
- u16 current_rd_ext;
|
|
int16_t power_limit;
|
|
struct reg_dmn_pair_mapping *regpair;
|
|
};
|
|
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
|
@@ -2047,11 +2047,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw
|
|
eeval = ah->eep_ops->get_eeprom(ah, EEP_REG_0);
|
|
regulatory->current_rd = eeval;
|
|
|
|
- eeval = ah->eep_ops->get_eeprom(ah, EEP_REG_1);
|
|
- if (AR_SREV_9285_12_OR_LATER(ah))
|
|
- eeval |= AR9285_RDEXT_DEFAULT;
|
|
- regulatory->current_rd_ext = eeval;
|
|
-
|
|
if (ah->opmode != NL80211_IFTYPE_AP &&
|
|
ah->hw_version.subvendorid == AR_SUBVENDOR_ID_NEW_A) {
|
|
if (regulatory->current_rd == 0x64 ||
|
|
--- a/drivers/net/wireless/ath/carl9170/main.c
|
|
+++ b/drivers/net/wireless/ath/carl9170/main.c
|
|
@@ -1912,7 +1912,6 @@ static int carl9170_parse_eeprom(struct
|
|
ar->hw->channel_change_time = 80 * 1000;
|
|
|
|
regulatory->current_rd = le16_to_cpu(ar->eeprom.reg_domain[0]);
|
|
- regulatory->current_rd_ext = le16_to_cpu(ar->eeprom.reg_domain[1]);
|
|
|
|
/* second part of wiphy init */
|
|
SET_IEEE80211_PERM_ADDR(ar->hw, ar->eeprom.mac_address);
|