kernel: 5.4: fix patches after wireguard backport

[openwrt/openwrt.git] / target / linux / generic / pending-5.4 / 770-14-net-ethernet-mtk_eth_soc-set-PPE-flow-hash-as-skb-ha.patch

diff --git a/target/linux/generic/pending-5.4/770-14-net-ethernet-mtk_eth_soc-set-PPE-flow-hash-as-skb-ha.patch b/target/linux/generic/pending-5.4/770-14-net-ethernet-mtk_eth_soc-set-PPE-flow-hash-as-skb-ha.patch
index 60ac12c013c9fdeb30d70681cda82ccc292f52b8..68ae19ec6e557128b6a56d3f99ed70b10e987fae 100644 (file)
--- a/target/linux/generic/pending-5.4/770-14-net-ethernet-mtk_eth_soc-set-PPE-flow-hash-as-skb-ha.patch
+++ b/target/linux/generic/pending-5.4/770-14-net-ethernet-mtk_eth_soc-set-PPE-flow-hash-as-skb-ha.patch
@@ -10,13 +10,31 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -1316,6 +1316,10 @@ static int mtk_poll_rx(struct napi_struc
+@@ -19,6 +19,7 @@
+ #include <linux/interrupt.h>
+ #include <linux/pinctrl/devinfo.h>
+ #include <linux/phylink.h>
++#include <linux/jhash.h>
+ #include <net/dsa.h>
+ 
+ #include "mtk_eth_soc.h"
+@@ -1246,6 +1247,7 @@ static int mtk_poll_rx(struct napi_struc
+               struct net_device *netdev;
+               unsigned int pktlen;
+               dma_addr_t dma_addr;
++              u32 hash;
+               int mac;
+ 
+               ring = mtk_get_rx_ring(eth);
+@@ -1315,6 +1317,12 @@ static int mtk_poll_rx(struct napi_struc
                skb->protocol = eth_type_trans(skb, netdev);
                bytes += pktlen;
  
 +              hash = trxd.rxd4 & GENMASK(13, 0);
-+              if (hash != GENMASK(13, 0))
++              if (hash != GENMASK(13, 0)) {
++                      hash = jhash_1word(hash, 0);
 +                      skb_set_hash(skb, hash, PKT_HASH_TYPE_L4);
++              }
 +
                if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX &&
                    (trxd.rxd2 & RX_DMA_VTAG))