diff options
author | Oleksij Rempel <linux@rempel-privat.de> | 2014-02-04 04:27:44 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-02-12 15:35:59 -0500 |
commit | 1db54ff1832b58b1b65d4d0a2842ee544a6112bd (patch) | |
tree | fdc0ed4e88692d5bb21e12ef2d06c3bbc14434e9 /drivers | |
parent | e5ba18c6901631237c49ec54ce54397369dea7fa (diff) |
ath9k_htc: use ath9k_cmn_process_rate
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c index fcf7f5aeb682..6bd7ef8818af 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | |||
@@ -929,42 +929,6 @@ void ath9k_host_rx_init(struct ath9k_htc_priv *priv) | |||
929 | ath9k_hw_startpcureceive(priv->ah, test_bit(OP_SCANNING, &priv->op_flags)); | 929 | ath9k_hw_startpcureceive(priv->ah, test_bit(OP_SCANNING, &priv->op_flags)); |
930 | } | 930 | } |
931 | 931 | ||
932 | static void ath9k_process_rate(struct ieee80211_hw *hw, | ||
933 | struct ieee80211_rx_status *rxs, | ||
934 | u8 rx_rate, u8 rs_flags) | ||
935 | { | ||
936 | struct ieee80211_supported_band *sband; | ||
937 | enum ieee80211_band band; | ||
938 | unsigned int i = 0; | ||
939 | |||
940 | if (rx_rate & 0x80) { | ||
941 | /* HT rate */ | ||
942 | rxs->flag |= RX_FLAG_HT; | ||
943 | if (rs_flags & ATH9K_RX_2040) | ||
944 | rxs->flag |= RX_FLAG_40MHZ; | ||
945 | if (rs_flags & ATH9K_RX_GI) | ||
946 | rxs->flag |= RX_FLAG_SHORT_GI; | ||
947 | rxs->rate_idx = rx_rate & 0x7f; | ||
948 | return; | ||
949 | } | ||
950 | |||
951 | band = hw->conf.chandef.chan->band; | ||
952 | sband = hw->wiphy->bands[band]; | ||
953 | |||
954 | for (i = 0; i < sband->n_bitrates; i++) { | ||
955 | if (sband->bitrates[i].hw_value == rx_rate) { | ||
956 | rxs->rate_idx = i; | ||
957 | return; | ||
958 | } | ||
959 | if (sband->bitrates[i].hw_value_short == rx_rate) { | ||
960 | rxs->rate_idx = i; | ||
961 | rxs->flag |= RX_FLAG_SHORTPRE; | ||
962 | return; | ||
963 | } | ||
964 | } | ||
965 | |||
966 | } | ||
967 | |||
968 | static inline void convert_htc_flag(struct ath_rx_status *rx_stats, | 932 | static inline void convert_htc_flag(struct ath_rx_status *rx_stats, |
969 | struct ath_htc_rx_status *rxstatus) | 933 | struct ath_htc_rx_status *rxstatus) |
970 | { | 934 | { |
@@ -1099,9 +1063,9 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv, | |||
1099 | } | 1063 | } |
1100 | } | 1064 | } |
1101 | 1065 | ||
1102 | ath9k_process_rate(hw, rx_status, rxbuf->rxstatus.rs_rate, | ||
1103 | rxbuf->rxstatus.rs_flags); | ||
1104 | 1066 | ||
1067 | if (ath9k_cmn_process_rate(common, hw, &rx_stats, rx_status)) | ||
1068 | goto rx_next; | ||
1105 | 1069 | ||
1106 | rx_stats.is_mybeacon = ath_is_mybeacon(common, hdr); | 1070 | rx_stats.is_mybeacon = ath_is_mybeacon(common, hdr); |
1107 | ath9k_cmn_process_rssi(common, hw, &rx_stats, rx_status); | 1071 | ath9k_cmn_process_rssi(common, hw, &rx_stats, rx_status); |