target/linux/generic/pending-5.4/770-02-net-ethernet-mtk_eth_soc-fix-rx-vlan-offload.patch

   1 From: Felix Fietkau <nbd@nbd.name>
   2 Date: Wed, 26 Aug 2020 16:52:12 +0200
   3 Subject: [PATCH] net: ethernet: mtk_eth_soc: fix rx vlan offload
   4
   5 The VLAN ID in the rx descriptor is only valid if the RX_DMA_VID bit is set
   6 Fixes frames wrongly marked with VLAN tags
   7
   8 Signed-off-by: Felix Fietkau <nbd@nbd.name>
   9 ---
  10
  11 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  12 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  13 @@ -1320,7 +1320,7 @@ static int mtk_poll_rx(struct napi_struc
  14                 skb->protocol = eth_type_trans(skb, netdev);
  15
  16                 if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX &&
  17 -                   RX_DMA_VID(trxd.rxd3))
  18 +                   (trxd.rxd2 & RX_DMA_VTAG))
  19                         __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
  20                                                RX_DMA_VID(trxd.rxd3));
  21                 skb_record_rx_queue(skb, 0);
  22 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
  23 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
  24 @@ -295,6 +295,7 @@
  25  #define RX_DMA_LSO             BIT(30)
  26  #define RX_DMA_PLEN0(_x)       (((_x) & 0x3fff) << 16)
  27  #define RX_DMA_GET_PLEN0(_x)   (((_x) >> 16) & 0x3fff)
  28 +#define RX_DMA_VTAG            BIT(15)
  29
  30  /* QDMA descriptor rxd3 */
  31  #define RX_DMA_VID(_x)         ((_x) & 0xfff)