ath9k_htc: Support reporting tx and rx chain mask.
PATCH 1/1 ath9k_htc: Support reporting tx and rx chain mask.
From: Ben Greear <[email protected]>
Signed-off-by Ben Greear <[email protected]>
--- drivers/net/wireless/ath/ath9k/htc.h | 2 + drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 16 +--------- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 7 ++++ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 38 ++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 15 deletions(-)
drivers/net/wireless/ath/ath9k/htc.h +2 -0
@@ -575,6 +575,8 @@ bool ath9k_htc_setpower(struct ath9k_htc_priv *priv,void ath9k_start_rfkill_poll (struct ath9k_htc_priv *priv);void ath9k_htc_rfkill_poll_state (struct ieee80211_hw *hw); +struct base_eep_header *ath9k_htc_get_eeprom_base (struct ath9k_htc_priv *priv); +#ifdef CONFIG_MAC80211_LEDS void ath9k_init_leds (struct ath9k_htc_priv *priv);void ath9k_deinit_leds (struct ath9k_htc_priv *priv);
drivers/net/wireless/ath/ath9k/htc_drv_debug.c +1 -15
@@ -496,21 +496,7 @@ static ssize_t read_file_base_eeprom(struct file *file, char __user *user_buf,ssize_t retval =0 ;char *buf; -/* -* This can be done since all the 3 EEPROM families have the -* same base header upto a certain point, and we are interested in -* the data only upto that point. -*/ - -if (AR_SREV_9271 (priv->ah)) - pBase = (struct base_eep_header *) - &priv->ah->eeprom.map4k.baseEepHeader; -else if (priv->ah->hw_version.usbdev ==AR9280_USB ) - pBase = (struct base_eep_header *) - &priv->ah->eeprom.def.baseEepHeader; -else if (priv->ah->hw_version.usbdev ==AR9287_USB ) - pBase = (struct base_eep_header *) - &priv->ah->eeprom.map9287.baseEepHeader; + pBase =ath9k_htc_get_eeprom_base (priv);if (pBase ==NULL ) {ath_err (common,"Unknown EEPROM type\n" );
drivers/net/wireless/ath/ath9k/htc_drv_init.c +7 -0
@@ -712,6 +712,7 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv, struct ieee80211_hw *hw) {struct ath_common *common =ath9k_hw_common (priv->ah); +struct base_eep_header *pBase; hw->flags =IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_AMPDU_AGGREGATION |
@@ -765,6 +766,12 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv, &priv->sbands[IEEE80211_BAND_5GHZ].ht_cap); } + pBase =ath9k_htc_get_eeprom_base (priv); +if (pBase) { + hw->wiphy->available_antennas_rx = pBase->rxMask; + hw->wiphy->available_antennas_tx = pBase->txMask; + } +SET_IEEE80211_PERM_ADDR (hw, common->macaddr); }
drivers/net/wireless/ath/ath9k/htc_drv_main.c +38 -0
@@ -1759,6 +1759,43 @@ static int ath9k_htc_get_stats(struct ieee80211_hw *hw,return 0 ; } +struct base_eep_header *ath9k_htc_get_eeprom_base (struct ath9k_htc_priv *priv) +{ +struct base_eep_header *pBase =NULL ; +/* +* This can be done since all the 3 EEPROM families have the +* same base header upto a certain point, and we are interested in +* the data only upto that point. +*/ + +if (AR_SREV_9271 (priv->ah)) + pBase = (struct base_eep_header *) + &priv->ah->eeprom.map4k.baseEepHeader; +else if (priv->ah->hw_version.usbdev ==AR9280_USB ) + pBase = (struct base_eep_header *) + &priv->ah->eeprom.def.baseEepHeader; +else if (priv->ah->hw_version.usbdev ==AR9287_USB ) + pBase = (struct base_eep_header *) + &priv->ah->eeprom.map9287.baseEepHeader; +return pBase; +} + + +static int ath9k_htc_get_antenna (struct ieee80211_hw *hw,u32 *tx_ant, +u32 *rx_ant) +{ +struct ath9k_htc_priv *priv = hw->priv; +struct base_eep_header *pBase =ath9k_htc_get_eeprom_base (priv); +if (pBase) { + *tx_ant = pBase->txMask; + *rx_ant = pBase->rxMask; + }else { + *tx_ant =0 ; + *rx_ant =0 ; + } +return 0 ; +} +struct ieee80211_ops ath9k_htc_ops = { .tx = ath9k_htc_tx, .start = ath9k_htc_start,
@@ -1784,4 +1821,5 @@ struct ieee80211_ops ath9k_htc_ops = { .set_coverage_class = ath9k_htc_set_coverage_class, .set_bitrate_mask = ath9k_htc_set_bitrate_mask, .get_stats = ath9k_htc_get_stats, + .get_antenna = ath9k_htc_get_antenna, };
Signature · 1 line
1.7.3.4