4cbdad0e9d
SVN-Revision: 26281
33 lines
943 B
Diff
33 lines
943 B
Diff
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
|
@@ -379,11 +379,6 @@ static void ath9k_hw_init_config(struct
|
|
ah->config.spurchans[i][1] = AR_NO_SPUR;
|
|
}
|
|
|
|
- if (ah->hw_version.devid != AR2427_DEVID_PCIE)
|
|
- ah->config.ht_enable = 1;
|
|
- else
|
|
- ah->config.ht_enable = 0;
|
|
-
|
|
/* PAPRD needs some more work to be enabled */
|
|
ah->config.paprd_disable = 1;
|
|
|
|
@@ -1889,7 +1884,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw
|
|
|
|
common->crypt_caps |= ATH_CRYPT_CAP_CIPHER_AESCCM;
|
|
|
|
- if (ah->config.ht_enable)
|
|
+ if (ah->hw_version.devid != AR2427_DEVID_PCIE)
|
|
pCap->hw_caps |= ATH9K_HW_CAP_HT;
|
|
else
|
|
pCap->hw_caps &= ~ATH9K_HW_CAP_HT;
|
|
--- a/drivers/net/wireless/ath/ath9k/hw.h
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.h
|
|
@@ -222,7 +222,6 @@ struct ath9k_ops_config {
|
|
u8 pcie_clock_req;
|
|
u32 pcie_waen;
|
|
u8 analog_shiftreg;
|
|
- u8 ht_enable;
|
|
u8 paprd_disable;
|
|
u32 ofdm_trig_low;
|
|
u32 ofdm_trig_high;
|