Merge tag 'mac80211-next-for-davem-2017-04-28' of git://git.kernel.org/pub/scm/linux...

Johannes Berg says:

====================
Another set of patches for -next:
 * API support for concurrent scheduled scan requests
 * API changes for roaming reporting
 * BSS max idle support in mac80211
 * API changes for TX status reporting in mac80211
 * API changes for RX rate reporting in mac80211
 * rewrite monitor logic to prepare for BPF filters
 * bugfix for rare devices without 2.4 GHz support
 * a bugfix for recent DFS changes
 * some further cleanups

The API changes are actually at a nice time, since it's
typically quiet just before the merge window, and trees
can be synchronized easily during it.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/rx.c
index d7c8e7de960b76566057c04cae5e196e2a7f558b,fb368d19c0a312e88dd1bc87ad6cb04167d40189..fd1dd06c4f182902c32ed3ba1cf30e1fac1d8b3b
--- 1/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
--- 2/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
@@@ -437,21 -437,21 +437,21 @@@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm 
                break;
        }
        if (rate_n_flags & RATE_MCS_SGI_MSK)
-               rx_status->flag |= RX_FLAG_SHORT_GI;
+               rx_status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
        if (rate_n_flags & RATE_HT_MCS_GF_MSK)
-               rx_status->flag |= RX_FLAG_HT_GF;
+               rx_status->enc_flags |= RX_ENC_FLAG_HT_GF;
        if (rate_n_flags & RATE_MCS_LDPC_MSK)
-               rx_status->flag |= RX_FLAG_LDPC;
+               rx_status->enc_flags |= RX_ENC_FLAG_LDPC;
        if (rate_n_flags & RATE_MCS_HT_MSK) {
 -              u8 stbc = (rate_n_flags & RATE_MCS_HT_STBC_MSK) >>
 +              u8 stbc = (rate_n_flags & RATE_MCS_STBC_MSK) >>
                                RATE_MCS_STBC_POS;
-               rx_status->flag |= RX_FLAG_HT;
+               rx_status->encoding = RX_ENC_HT;
                rx_status->rate_idx = rate_n_flags & RATE_HT_MCS_INDEX_MSK;
-               rx_status->flag |= stbc << RX_FLAG_STBC_SHIFT;
+               rx_status->enc_flags |= stbc << RX_ENC_FLAG_STBC_SHIFT;
        } else if (rate_n_flags & RATE_MCS_VHT_MSK) {
 -              u8 stbc = (rate_n_flags & RATE_MCS_VHT_STBC_MSK) >>
 +              u8 stbc = (rate_n_flags & RATE_MCS_STBC_MSK) >>
                                RATE_MCS_STBC_POS;
-               rx_status->vht_nss =
+               rx_status->nss =
                        ((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;

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index 362b240da65c988ac22c36e741375797ae3a4454,d66b2b527bd8b2e0e9f7c8678fe10f54fc35246c..966cd7543629b3c2dd6d9bbf33fcaffd9582ab63
--- 1/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
--- 2/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@@ -968,21 -968,21 +968,21 @@@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm 
                break;
        }
        if (rate_n_flags & RATE_MCS_SGI_MSK)
-               rx_status->flag |= RX_FLAG_SHORT_GI;
+               rx_status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
        if (rate_n_flags & RATE_HT_MCS_GF_MSK)
-               rx_status->flag |= RX_FLAG_HT_GF;
+               rx_status->enc_flags |= RX_ENC_FLAG_HT_GF;
        if (rate_n_flags & RATE_MCS_LDPC_MSK)
-               rx_status->flag |= RX_FLAG_LDPC;
+               rx_status->enc_flags |= RX_ENC_FLAG_LDPC;
        if (rate_n_flags & RATE_MCS_HT_MSK) {
 -              u8 stbc = (rate_n_flags & RATE_MCS_HT_STBC_MSK) >>
 +              u8 stbc = (rate_n_flags & RATE_MCS_STBC_MSK) >>
                                RATE_MCS_STBC_POS;
-               rx_status->flag |= RX_FLAG_HT;
+               rx_status->encoding = RX_ENC_HT;
                rx_status->rate_idx = rate_n_flags & RATE_HT_MCS_INDEX_MSK;
-               rx_status->flag |= stbc << RX_FLAG_STBC_SHIFT;
+               rx_status->enc_flags |= stbc << RX_ENC_FLAG_STBC_SHIFT;
        } else if (rate_n_flags & RATE_MCS_VHT_MSK) {
 -              u8 stbc = (rate_n_flags & RATE_MCS_VHT_STBC_MSK) >>
 +              u8 stbc = (rate_n_flags & RATE_MCS_STBC_MSK) >>
                                RATE_MCS_STBC_POS;
-               rx_status->vht_nss =
+               rx_status->nss =
                        ((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;

diff --cc drivers/net/wireless/rndis_wlan.c
Simple merge