ath: remove ath_regulatory::current_rd_ext

It is unused since the previous dead code that was using it had been
removed earlier.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index bb71b4f27a9b8a839e73b62d3c13d108777e4f1f..908fdbc3e0eeaaef62523ee5828d50e760f8e627 100644 (file)
--- 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;
 };

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 949656d928d36c39cb03128880feaf7590822a5d..fd7c2077dfd46d9c4788843f336a4012e49d0e39 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -2072,11 +2072,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
        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 ||

diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index beca71073e9bdd6f786ac0f58e53c42e4e994d8f..f06e0695d412fb9631117d6261608834a4376eb9 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1896,7 +1896,6 @@ static int carl9170_parse_eeprom(struct ar9170 *ar)
                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);