diff options
| author | Felix Fietkau <nbd@nbd.name> | 2021-11-23 11:37:47 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2021-12-19 15:24:00 +0100 |
| commit | 1eeff0b4c1a6c64d24fc562c2ebb019d35fc93fc (patch) | |
| tree | 73d4b347f95c6c8693ab291685daba4adbfdae3f /drivers/net/wireless/mediatek | |
| parent | 633f77b517ac704086c267b70a6dfe1924cfed0b (diff) | |
mt76: mt7915: fix decap offload corner case with 4-addr VLAN frames
With 4-address mode VLAN frames, an internal header translation step fails,
leaving behind an extra 2-byte length field that must be reomved by the driver.
Add a check for this condition to fix receiving such packets
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'drivers/net/wireless/mediatek')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c index 2e156c8bf86a..c15beb42ec4c 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c @@ -749,10 +749,29 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb) return -EINVAL; hdr_trans = false; } else { + int pad_start = 0; + skb_pull(skb, hdr_gap); if (!hdr_trans && status->amsdu) { - memmove(skb->data + 2, skb->data, - ieee80211_get_hdrlen_from_skb(skb)); + pad_start = ieee80211_get_hdrlen_from_skb(skb); + } else if (hdr_trans && (rxd2 & MT_RXD2_NORMAL_HDR_TRANS_ERROR)) { + /* + * When header translation failure is indicated, + * the hardware will insert an extra 2-byte field + * containing the data length after the protocol + * type field. + */ + pad_start = 12; + if (get_unaligned_be16(skb->data + pad_start) == ETH_P_8021Q) + pad_start += 4; + + if (get_unaligned_be16(skb->data + pad_start) != + skb->len - pad_start - 2) + pad_start = 0; + } + + if (pad_start) { + memmove(skb->data + 2, skb->data, pad_start); skb_pull(skb, 2); } } |