kernel: bump 5.4 to 5.4.52

[openwrt/openwrt.git] / target / linux / mvebu / patches-5.4 / 016-net-mvneta-add-XDP_TX-support.patch

diff --git a/target/linux/mvebu/patches-5.4/016-net-mvneta-add-XDP_TX-support.patch b/target/linux/mvebu/patches-5.4/016-net-mvneta-add-XDP_TX-support.patch
index 9edf32ff6de4e8efdc988c69b3ba43d6e1073997..012bdee8bf3075939722e0c4b024f5a174f1c885 100644 (file)
--- a/target/linux/mvebu/patches-5.4/016-net-mvneta-add-XDP_TX-support.patch
+++ b/target/linux/mvebu/patches-5.4/016-net-mvneta-add-XDP_TX-support.patch
@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -1811,16 +1811,19 @@ static void mvneta_txq_bufs_free(struct
+@@ -1813,16 +1813,19 @@ static void mvneta_txq_bufs_free(struct
  
                mvneta_txq_inc_get(txq);
  
@@ -41,7 +41,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        }
  
        netdev_tx_completed_queue(nq, pkts_compl, bytes_compl);
-@@ -1985,6 +1988,111 @@ int mvneta_rx_refill_queue(struct mvneta
+@@ -1987,6 +1990,111 @@ int mvneta_rx_refill_queue(struct mvneta
  }
  
  static int
@@ -153,7 +153,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  mvneta_run_xdp(struct mvneta_port *pp, struct mvneta_rx_queue *rxq,
               struct bpf_prog *prog, struct xdp_buff *xdp)
  {
-@@ -2006,6 +2114,11 @@ mvneta_run_xdp(struct mvneta_port *pp, s
+@@ -2008,6 +2116,11 @@ mvneta_run_xdp(struct mvneta_port *pp, s
                }
                break;
        }
@@ -165,7 +165,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        default:
                bpf_warn_invalid_xdp_action(act);
                /* fall through */
-@@ -4542,6 +4655,7 @@ static const struct net_device_ops mvnet
+@@ -4574,6 +4687,7 @@ static const struct net_device_ops mvnet
        .ndo_get_stats64     = mvneta_get_stats64,
        .ndo_do_ioctl        = mvneta_ioctl,
        .ndo_bpf             = mvneta_xdp,