mac80211: separate encoding/bandwidth from flags

[linux-2.6-block.git] / drivers / net / wireless / ath / ath9k / recv.c

diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index 65fcc34196f996b7541816d81b9435f9e39bd517..2197aee2bb72adcd24cb24949a6c82a142dfde7d 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -1038,10 +1038,10 @@ static void ath_rx_count_airtime(struct ath_softc *sc,
        rxs = IEEE80211_SKB_RXCB(skb);
 
        is_sgi = !!(rxs->enc_flags & RX_ENC_FLAG_SHORT_GI);
-       is_40 = !!(rxs->enc_flags & RX_ENC_FLAG_40MHZ);
+       is_40 = !!(rxs->bw == RATE_INFO_BW_40);
        is_sp = !!(rxs->enc_flags & RX_ENC_FLAG_SHORTPRE);
 
-       if (!!(rxs->enc_flags & RX_ENC_FLAG_HT)) {
+       if (!!(rxs->encoding == RX_ENC_HT)) {
                /* MCS rates */
 
                airtime += ath_pkt_duration(sc, rxs->rate_idx, len,