Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
[muen/linux.git] / drivers / net / wireless / ath / ath9k / common.c
index eea2f7f..099f3d4 100644 (file)
@@ -181,14 +181,15 @@ int ath9k_cmn_process_rate(struct ath_common *common,
        sband = hw->wiphy->bands[band];
 
        if (IS_CHAN_QUARTER_RATE(ah->curchan))
-               rxs->flag |= RX_FLAG_5MHZ;
+               rxs->bw = RATE_INFO_BW_5;
        else if (IS_CHAN_HALF_RATE(ah->curchan))
-               rxs->flag |= RX_FLAG_10MHZ;
+               rxs->bw = RATE_INFO_BW_10;
 
        if (rx_stats->rs_rate & 0x80) {
                /* HT rate */
-               rxs->flag |= RX_FLAG_HT;
-               rxs->flag |= rx_stats->flag;
+               rxs->encoding = RX_ENC_HT;
+               rxs->enc_flags |= rx_stats->enc_flags;
+               rxs->bw = rx_stats->bw;
                rxs->rate_idx = rx_stats->rs_rate & 0x7f;
                return 0;
        }
@@ -199,7 +200,7 @@ int ath9k_cmn_process_rate(struct ath_common *common,
                        return 0;
                }
                if (sband->bitrates[i].hw_value_short == rx_stats->rs_rate) {
-                       rxs->flag |= RX_FLAG_SHORTPRE;
+                       rxs->enc_flags |= RX_ENC_FLAG_SHORTPRE;
                        rxs->rate_idx = i;
                        return 0;
                }