kernel: bump 5.15 to 5.15.132

[openwrt/staging/hauke.git] / target / linux / generic / backport-5.15 / 706-01-v6.0-net-ethernet-mtk_eth_soc-add-basic-XDP-support.patch

diff --git a/target/linux/generic/backport-5.15/706-01-v6.0-net-ethernet-mtk_eth_soc-add-basic-XDP-support.patch b/target/linux/generic/backport-5.15/706-01-v6.0-net-ethernet-mtk_eth_soc-add-basic-XDP-support.patch
index 60e83a16513af7558abf14946dea4dab2784dc20..49b2355ce408483d8bac23b6f7c103643a51ef92 100644 (file)
--- a/target/linux/generic/backport-5.15/706-01-v6.0-net-ethernet-mtk_eth_soc-add-basic-XDP-support.patch
+++ b/target/linux/generic/backport-5.15/706-01-v6.0-net-ethernet-mtk_eth_soc-add-basic-XDP-support.patch
@@ -208,7 +208,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                struct page_pool *pp;
  
                pp = mtk_create_page_pool(eth, &ring->xdp_q, ring_no,
-@@ -2710,6 +2785,48 @@ static int mtk_stop(struct net_device *d
+@@ -2713,6 +2788,48 @@ static int mtk_stop(struct net_device *d
        return 0;
  }
  
@@ -257,7 +257,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void ethsys_reset(struct mtk_eth *eth, u32 reset_bits)
  {
        regmap_update_bits(eth->ethsys, ETHSYS_RSTCTRL,
-@@ -2988,6 +3105,12 @@ static int mtk_change_mtu(struct net_dev
+@@ -2991,6 +3108,12 @@ static int mtk_change_mtu(struct net_dev
        struct mtk_eth *eth = mac->hw;
        u32 mcr_cur, mcr_new;
  
@@ -270,7 +270,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        if (!MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) {
                mcr_cur = mtk_r32(mac->hw, MTK_MAC_MCR(mac->id));
                mcr_new = mcr_cur & ~MAC_MCR_MAX_RX_MASK;
-@@ -3314,6 +3437,7 @@ static const struct net_device_ops mtk_n
+@@ -3317,6 +3440,7 @@ static const struct net_device_ops mtk_n
        .ndo_poll_controller    = mtk_poll_controller,
  #endif
        .ndo_setup_tc           = mtk_eth_setup_tc,