1 files changed, 8 insertions, 17 deletions

diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 90d4f74c28d7..fcb534f2f28f 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -659,23 +659,6 @@ static void ath10k_htt_rx_amsdu(struct ath10k_htt *htt,
         memcpy(hdr_buf, hdr, hdr_len);
         hdr = (struct ieee80211_hdr *)hdr_buf;
 
-        /* FIXME: Hopefully this is a temporary measure.
-         *
-         * Reporting individual A-MSDU subframes means each reported frame
-         * shares the same sequence number.
-         *
-         * mac80211 drops frames it recognizes as duplicates, i.e.
-         * retransmission flag is set and sequence number matches sequence
-         * number from a previous frame (as per IEEE 802.11-2012: 9.3.2.10
-         * "Duplicate detection and recovery")
-         *
-         * To avoid frames being dropped clear retransmission flag for all
-         * received A-MSDUs.
-         *
-         * Worst case: actual duplicate frames will be reported but this should
-         * still be handled gracefully by other OSI/ISO layers. */
-        hdr->frame_control &= cpu_to_le16(~IEEE80211_FCTL_RETRY);
-
         first = skb;
         while (skb) {
                 void *decap_hdr;
@@ -746,6 +729,9 @@ static void ath10k_htt_rx_amsdu(struct ath10k_htt *htt,
                 skb = skb->next;
                 info->skb->next = NULL;
 
+                if (skb)
+                        info->amsdu_more = true;
+
                 ath10k_process_rx(htt->ar, info);
         }
 
@@ -959,6 +945,11 @@ static void ath10k_htt_rx_handler(struct ath10k_htt *htt,
                                 continue;
                         }
 
+                        if (test_bit(ATH10K_CAC_RUNNING, &htt->ar->dev_flags)) {
+                                ath10k_htt_rx_free_msdu_chain(msdu_head);
+                                continue;
+                        }
+
                         /* FIXME: we do not support chaining yet.
                          * this needs investigation */
                         if (msdu_chaining) {