37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
||
|
|
@@ -1941,23 +1941,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw
|
||
|
|
else
|
||
|
|
pCap->hw_caps |= ATH9K_HW_CAP_4KB_SPLITTRANS;
|
||
|
|
|
||
|
|
- if (regulatory->current_rd_ext & (1 << REG_EXT_JAPAN_MIDBAND)) {
|
||
|
|
- pCap->reg_cap =
|
||
|
|
- AR_EEPROM_EEREGCAP_EN_KK_NEW_11A |
|
||
|
|
- AR_EEPROM_EEREGCAP_EN_KK_U1_EVEN |
|
||
|
|
- AR_EEPROM_EEREGCAP_EN_KK_U2 |
|
||
|
|
- AR_EEPROM_EEREGCAP_EN_KK_MIDBAND;
|
||
|
|
- } else {
|
||
|
|
- pCap->reg_cap =
|
||
|
|
- AR_EEPROM_EEREGCAP_EN_KK_NEW_11A |
|
||
|
|
- AR_EEPROM_EEREGCAP_EN_KK_U1_EVEN;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- /* Advertise midband for AR5416 with FCC midband set in eeprom */
|
||
|
|
- if (regulatory->current_rd_ext & (1 << REG_EXT_FCC_MIDBAND) &&
|
||
|
|
- AR_SREV_5416(ah))
|
||
|
|
- pCap->reg_cap |= AR_EEPROM_EEREGCAP_EN_FCC_MIDBAND;
|
||
|
|
-
|
||
|
|
if (AR_SREV_9280_20_OR_LATER(ah) && common->btcoex_enabled) {
|
||
|
|
btcoex_hw->btactive_gpio = ATH_BTACTIVE_GPIO;
|
||
|
|
btcoex_hw->wlanactive_gpio = ATH_WLANACTIVE_GPIO;
|
||
|
|
--- a/drivers/net/wireless/ath/ath9k/hw.h
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.h
|
||
|
|
@@ -200,7 +200,6 @@ struct ath9k_hw_capabilities {
|
||
|
|
u8 max_txchains;
|
||
|
|
u8 max_rxchains;
|
||
|
|
u16 tx_triglevel_max;
|
||
|
|
- u16 reg_cap;
|
||
|
|
u8 num_gpio_pins;
|
||
|
|
u8 rx_hp_qdepth;
|
||
|
|
u8 rx_lp_qdepth;
|