ath10k: implement 802.3 SNAP rx decap type A-MSDU handling

[cascardo/linux.git] / drivers / net / wireless / ath / ath10k / htt_rx.c

diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index e784c40..9bb0ae8 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -610,8 +610,7 @@ static int ath10k_htt_rx_amsdu(struct ath10k_htt *htt,
                        RX_MPDU_START_INFO0_ENCRYPT_TYPE);
 
        /* FIXME: No idea what assumptions are safe here. Need logs */
-       if ((fmt == RX_MSDU_DECAP_RAW && skb->next) ||
-           (fmt == RX_MSDU_DECAP_8023_SNAP_LLC)) {
+       if ((fmt == RX_MSDU_DECAP_RAW && skb->next)) {
                ath10k_htt_rx_free_msdu_chain(skb->next);
                skb->next = NULL;
                return -ENOTSUPP;
@@ -659,6 +658,15 @@ static int ath10k_htt_rx_amsdu(struct ath10k_htt *htt,
                        decap_hdr += roundup(crypto_len, 4);
                }
 
+               /* When fmt == RX_MSDU_DECAP_8023_SNAP_LLC:
+                *
+                * SNAP 802.3 consists of:
+                * [dst:6][src:6][len:2][dsap:1][ssap:1][ctl:1][snap:5]
+                * [data][fcs:4].
+                *
+                * Since this overlaps with A-MSDU header (da, sa, len)
+                * there's nothing extra to do. */
+
                if (fmt == RX_MSDU_DECAP_ETHERNET2_DIX) {
                        /* Ethernet2 decap inserts ethernet header in place of
                         * A-MSDU subframe header. */