diff options
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 16 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 2 |
2 files changed, 4 insertions, 14 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 05c95e67a853..e08ab73fcacb 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -2498,19 +2498,11 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) eeval = ah->eep_ops->get_eeprom(ah, EEP_OP_MODE); - if (eeval & AR5416_OPFLAGS_11A) { - if (ah->disable_5ghz) - ath_warn(common, "disabling 5GHz band\n"); - else - pCap->hw_caps |= ATH9K_HW_CAP_5GHZ; - } + if (eeval & AR5416_OPFLAGS_11A) + pCap->hw_caps |= ATH9K_HW_CAP_5GHZ; - if (eeval & AR5416_OPFLAGS_11G) { - if (ah->disable_2ghz) - ath_warn(common, "disabling 2GHz band\n"); - else - pCap->hw_caps |= ATH9K_HW_CAP_2GHZ; - } + if (eeval & AR5416_OPFLAGS_11G) + pCap->hw_caps |= ATH9K_HW_CAP_2GHZ; if ((pCap->hw_caps & (ATH9K_HW_CAP_2GHZ | ATH9K_HW_CAP_5GHZ)) == 0) { ath_err(common, "both bands are disabled\n"); diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index d9d2f64c5570..b942b8303d8f 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h @@ -974,8 +974,6 @@ struct ath_hw { bool is_clk_25mhz; int (*get_mac_revision)(void); int (*external_reset)(void); - bool disable_2ghz; - bool disable_5ghz; const struct firmware *eeprom_blob; u16 *nvmem_blob; /* devres managed */ |