kernel: bump 5.15 to 5.15.103

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 706-02-v6.0-net-ethernet-mtk_eth_soc-introduce-xdp-ethtool-count.patch

diff --git a/target/linux/generic/backport-5.15/706-02-v6.0-net-ethernet-mtk_eth_soc-introduce-xdp-ethtool-count.patch b/target/linux/generic/backport-5.15/706-02-v6.0-net-ethernet-mtk_eth_soc-introduce-xdp-ethtool-count.patch
index b68f44aae2a26f336124b88e6c6df529a0795138..cf4d658684ba82076f7a6f4ccd7ed2b536d26e40 100644 (file)
--- a/target/linux/generic/backport-5.15/706-02-v6.0-net-ethernet-mtk_eth_soc-introduce-xdp-ethtool-count.patch
+++ b/target/linux/generic/backport-5.15/706-02-v6.0-net-ethernet-mtk_eth_soc-introduce-xdp-ethtool-count.patch
@@ -39,7 +39,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const char * const mtk_clks_source_name[] = {
-@@ -1458,6 +1469,9 @@ static void mtk_rx_put_buff(struct mtk_r
+@@ -1459,6 +1470,9 @@ static void mtk_rx_put_buff(struct mtk_r
  static u32 mtk_xdp_run(struct mtk_eth *eth, struct mtk_rx_ring *ring,
                       struct xdp_buff *xdp, struct net_device *dev)
  {
@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        struct bpf_prog *prog;
        u32 act = XDP_PASS;
  
-@@ -1470,13 +1484,16 @@ static u32 mtk_xdp_run(struct mtk_eth *e
+@@ -1471,13 +1485,16 @@ static u32 mtk_xdp_run(struct mtk_eth *e
        act = bpf_prog_run_xdp(prog, xdp);
        switch (act) {
        case XDP_PASS:
@@ -68,7 +68,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        default:
                bpf_warn_invalid_xdp_action(act);
                fallthrough;
-@@ -1489,6 +1506,11 @@ static u32 mtk_xdp_run(struct mtk_eth *e
+@@ -1490,6 +1507,11 @@ static u32 mtk_xdp_run(struct mtk_eth *e
  
        page_pool_put_full_page(ring->page_pool,
                                virt_to_head_page(xdp->data), true);
@@ -82,7 +82,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -567,6 +567,16 @@ struct mtk_tx_dma_v2 {
+@@ -568,6 +568,16 @@ struct mtk_tx_dma_v2 {
  struct mtk_eth;
  struct mtk_mac;
  
@@ -99,7 +99,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  /* struct mtk_hw_stats - the structure that holds the traffic statistics.
   * @stats_lock:               make sure that stats operations are atomic
   * @reg_offset:               the status register offset of the SoC
-@@ -590,6 +600,8 @@ struct mtk_hw_stats {
+@@ -591,6 +601,8 @@ struct mtk_hw_stats {
        u64 rx_checksum_errors;
        u64 rx_flow_control_packets;