diff options
author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2013-06-02 23:49:23 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-06-03 15:55:45 -0400 |
commit | 74a97755f2c2687207e3b1e9e77765b475f7e4e4 (patch) | |
tree | 7af81b1df0f26a60d1390e7e5dce10a89a13f49a /drivers | |
parent | bda96e8c6a751d8f57a5564e18adf33f2a2d857e (diff) |
ath9k: Return early for invalid rates
Process and update the internal RSSI average, which
is used by ANI, after verifying that the received
frame has valid rate information.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index b4b758deb30e..865e043e8aa6 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c | |||
@@ -955,11 +955,11 @@ static int ath9k_rx_skb_preprocess(struct ath_softc *sc, | |||
955 | if (rx_stats->rs_more) | 955 | if (rx_stats->rs_more) |
956 | return 0; | 956 | return 0; |
957 | 957 | ||
958 | ath9k_process_rssi(common, hw, hdr, rx_stats); | ||
959 | |||
960 | if (ath9k_process_rate(common, hw, rx_stats, rx_status)) | 958 | if (ath9k_process_rate(common, hw, rx_stats, rx_status)) |
961 | return -EINVAL; | 959 | return -EINVAL; |
962 | 960 | ||
961 | ath9k_process_rssi(common, hw, hdr, rx_stats); | ||
962 | |||
963 | rx_status->band = hw->conf.chandef.chan->band; | 963 | rx_status->band = hw->conf.chandef.chan->band; |
964 | rx_status->freq = hw->conf.chandef.chan->center_freq; | 964 | rx_status->freq = hw->conf.chandef.chan->center_freq; |
965 | rx_status->signal = ah->noise + rx_stats->rs_rssi; | 965 | rx_status->signal = ah->noise + rx_stats->rs_rssi; |