]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: mt76: mt7996: Add eht radiotap tlv
authorBen Greear <greearb@candelatech.com>
Mon, 9 Sep 2024 21:12:37 +0000 (14:12 -0700)
committerFelix Fietkau <nbd@nbd.name>
Mon, 13 Jan 2025 10:21:54 +0000 (11:21 +0100)
This duplicates what the 7925 driver is doing, wireshark seems to
at least mostly decode it as expected.

Signed-off-by: Ben Greear <greearb@candelatech.com>
Link: https://patch.msgid.link/20240909211238.3237111-1-greearb@candelatech.com
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7996/mac.c

index 0d21414e2c884a32771d81bdde68328ce90f0901..4706ddefea9e11fdb341557aa13689d88baae7e3 100644 (file)
@@ -679,14 +679,25 @@ mt7996_mac_fill_rx(struct mt7996_dev *dev, enum mt76_rxq_id q,
                        if (ieee80211_has_a4(fc) && is_mesh && status->amsdu)
                                *qos &= ~IEEE80211_QOS_CTL_A_MSDU_PRESENT;
                }
+               skb_set_mac_header(skb, (unsigned char *)hdr - skb->data);
        } else {
                status->flag |= RX_FLAG_8023;
                mt7996_wed_check_ppe(dev, &dev->mt76.q_rx[q], msta, skb,
                                     *info);
        }
 
-       if (rxv && mode >= MT_PHY_TYPE_HE_SU && !(status->flag & RX_FLAG_8023))
-               mt76_connac3_mac_decode_he_radiotap(skb, rxv, mode);
+       if (rxv && !(status->flag & RX_FLAG_8023)) {
+               switch (status->encoding) {
+               case RX_ENC_EHT:
+                       mt76_connac3_mac_decode_eht_radiotap(skb, rxv, mode);
+                       break;
+               case RX_ENC_HE:
+                       mt76_connac3_mac_decode_he_radiotap(skb, rxv, mode);
+                       break;
+               default:
+                       break;
+               }
+       }
 
        if (!status->wcid || !ieee80211_is_data_qos(fc) || hw_aggr)
                return 0;