diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.h')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index abaa2f09a3bc..f8f5e997162c 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -148,21 +148,6 @@ enum wireless_mode { | |||
148 | ATH9K_MODE_MAX, | 148 | ATH9K_MODE_MAX, |
149 | }; | 149 | }; |
150 | 150 | ||
151 | /** | ||
152 | * ath9k_ant_setting - transmit antenna settings | ||
153 | * | ||
154 | * Configures the antenna setting to use for transmit. | ||
155 | * | ||
156 | * @ATH9K_ANT_VARIABLE: this means transmit on all active antennas | ||
157 | * @ATH9K_ANT_FIXED_A: this means transmit on the first antenna only | ||
158 | * @ATH9K_ANT_FIXED_B: this means transmit on the second antenna only | ||
159 | */ | ||
160 | enum ath9k_ant_setting { | ||
161 | ATH9K_ANT_VARIABLE = 0, | ||
162 | ATH9K_ANT_FIXED_A, | ||
163 | ATH9K_ANT_FIXED_B | ||
164 | }; | ||
165 | |||
166 | enum ath9k_hw_caps { | 151 | enum ath9k_hw_caps { |
167 | ATH9K_HW_CAP_MIC_AESCCM = BIT(0), | 152 | ATH9K_HW_CAP_MIC_AESCCM = BIT(0), |
168 | ATH9K_HW_CAP_MIC_CKIP = BIT(1), | 153 | ATH9K_HW_CAP_MIC_CKIP = BIT(1), |
@@ -226,8 +211,6 @@ struct ath9k_ops_config { | |||
226 | u32 cck_trig_high; | 211 | u32 cck_trig_high; |
227 | u32 cck_trig_low; | 212 | u32 cck_trig_low; |
228 | u32 enable_ani; | 213 | u32 enable_ani; |
229 | enum ath9k_ant_setting diversity_control; | ||
230 | u16 antenna_switch_swap; | ||
231 | int serialize_regmode; | 214 | int serialize_regmode; |
232 | bool intr_mitigation; | 215 | bool intr_mitigation; |
233 | #define SPUR_DISABLE 0 | 216 | #define SPUR_DISABLE 0 |
@@ -572,7 +555,6 @@ struct ath_hw { | |||
572 | u32 acktimeout; | 555 | u32 acktimeout; |
573 | u32 ctstimeout; | 556 | u32 ctstimeout; |
574 | u32 globaltxtimeout; | 557 | u32 globaltxtimeout; |
575 | u8 gbeacon_rate; | ||
576 | 558 | ||
577 | /* ANI */ | 559 | /* ANI */ |
578 | u32 proc_phyerr; | 560 | u32 proc_phyerr; |
@@ -659,11 +641,6 @@ void ath9k_hw_cfg_output(struct ath_hw *ah, u32 gpio, | |||
659 | void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val); | 641 | void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val); |
660 | u32 ath9k_hw_getdefantenna(struct ath_hw *ah); | 642 | u32 ath9k_hw_getdefantenna(struct ath_hw *ah); |
661 | void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna); | 643 | void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna); |
662 | bool ath9k_hw_setantennaswitch(struct ath_hw *ah, | ||
663 | enum ath9k_ant_setting settings, | ||
664 | struct ath9k_channel *chan, | ||
665 | u8 *tx_chainmask, u8 *rx_chainmask, | ||
666 | u8 *antenna_cfgd); | ||
667 | 644 | ||
668 | /* General Operation */ | 645 | /* General Operation */ |
669 | bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout); | 646 | bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout); |