iwlwifi: iwlmvm: ignore HE PPDU type regarding EOF

When setting the EOF bit in Rx flags (propagated
to radiotap) do not depend it on the PPDU type (SU/MU/TB)
since it doesn't.

Signed-off-by: Shaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index 7bd8676508f5422d96fea16219aee29f7d5293d6..786e93f6b5025f914648a6697413a490751fb6a0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -1158,14 +1158,12 @@ static void iwl_mvm_rx_he(struct iwl_mvm *mvm, struct sk_buff *skb,
        /* temporarily hide the radiotap data */
        __skb_pull(skb, radiotap_len);
 
-       if (phy_data->info_type == IWL_RX_PHY_INFO_TYPE_HE_SU) {
-               /* report the AMPDU-EOF bit on single frames */
-               if (!queue && !(phy_info & IWL_RX_MPDU_PHY_AMPDU)) {
-                       rx_status->flag |= RX_FLAG_AMPDU_DETAILS;
-                       rx_status->flag |= RX_FLAG_AMPDU_EOF_BIT_KNOWN;
-                       if (phy_data->d0 & cpu_to_le32(IWL_RX_PHY_DATA0_HE_DELIM_EOF))
-                               rx_status->flag |= RX_FLAG_AMPDU_EOF_BIT;
-               }
+       /* report the AMPDU-EOF bit on single frames */
+       if (!queue && !(phy_info & IWL_RX_MPDU_PHY_AMPDU)) {
+               rx_status->flag |= RX_FLAG_AMPDU_DETAILS;
+               rx_status->flag |= RX_FLAG_AMPDU_EOF_BIT_KNOWN;
+               if (phy_data->d0 & cpu_to_le32(IWL_RX_PHY_DATA0_HE_DELIM_EOF))
+                       rx_status->flag |= RX_FLAG_AMPDU_EOF_BIT;
        }
 
        if (phy_info & IWL_RX_MPDU_PHY_TSF_OVERLOAD)
@@ -1178,9 +1176,7 @@ static void iwl_mvm_rx_he(struct iwl_mvm *mvm, struct sk_buff *skb,
                bool toggle_bit = phy_info & IWL_RX_MPDU_PHY_AMPDU_TOGGLE;
 
                /* toggle is switched whenever new aggregation starts */
-               if (toggle_bit != mvm->ampdu_toggle &&
-                   (he_type == RATE_MCS_HE_TYPE_MU ||
-                    he_type == RATE_MCS_HE_TYPE_SU)) {
+               if (toggle_bit != mvm->ampdu_toggle) {
                        rx_status->flag |= RX_FLAG_AMPDU_EOF_BIT_KNOWN;
                        if (phy_data->d0 & cpu_to_le32(IWL_RX_PHY_DATA0_HE_DELIM_EOF))
                                rx_status->flag |= RX_FLAG_AMPDU_EOF_BIT;