mac80211: separate encoding/bandwidth from flags

[linux-2.6-block.git] / drivers / net / wireless / intel / iwlwifi / mvm / rx.c

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
index 314a245e249e36ae05ebd7c2deaed15bf9cc1d0e..93226329e0773c7a78ca9253f4bf0db641801dd7 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
@@ -427,13 +427,13 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,
        case RATE_MCS_CHAN_WIDTH_20:
                break;
        case RATE_MCS_CHAN_WIDTH_40:
-               rx_status->enc_flags |= RX_ENC_FLAG_40MHZ;
+               rx_status->bw = RATE_INFO_BW_40;
                break;
        case RATE_MCS_CHAN_WIDTH_80:
-               rx_status->enc_flags |= RX_ENC_FLAG_80MHZ;
+               rx_status->bw = RATE_INFO_BW_80;
                break;
        case RATE_MCS_CHAN_WIDTH_160:
-               rx_status->enc_flags |= RX_ENC_FLAG_160MHZ;
+               rx_status->bw = RATE_INFO_BW_160;
                break;
        }
        if (rate_n_flags & RATE_MCS_SGI_MSK)
@@ -445,7 +445,7 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,
        if (rate_n_flags & RATE_MCS_HT_MSK) {
                u8 stbc = (rate_n_flags & RATE_MCS_HT_STBC_MSK) >>
                                RATE_MCS_STBC_POS;
-               rx_status->enc_flags |= RX_ENC_FLAG_HT;
+               rx_status->encoding = RX_ENC_HT;
                rx_status->rate_idx = rate_n_flags & RATE_HT_MCS_INDEX_MSK;
                rx_status->enc_flags |= stbc << RX_ENC_FLAG_STBC_SHIFT;
        } else if (rate_n_flags & RATE_MCS_VHT_MSK) {
@@ -455,7 +455,7 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,
                        ((rate_n_flags & RATE_VHT_MCS_NSS_MSK) >>
                                                RATE_VHT_MCS_NSS_POS) + 1;
                rx_status->rate_idx = rate_n_flags & RATE_VHT_MCS_RATE_CODE_MSK;
-               rx_status->enc_flags |= RX_ENC_FLAG_VHT;
+               rx_status->encoding = RX_ENC_VHT;
                rx_status->enc_flags |= stbc << RX_ENC_FLAG_STBC_SHIFT;
                if (rate_n_flags & RATE_MCS_BF_MSK)
                        rx_status->enc_flags |= RX_ENC_FLAG_BF;