kernel: bump 5.15 to 5.15.137

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 702-v5.19-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch

diff --git a/target/linux/generic/backport-5.15/702-v5.19-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch b/target/linux/generic/backport-5.15/702-v5.19-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch
index d5b1d2141331becffcf3b1a897ae424cb991c88f..69113c2ffafc6f1988eaf1f5bb7443ac14d4de07 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch
@@ -233,7 +233,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  static inline void
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -870,6 +870,7 @@ enum net_device_path_type {
+@@ -875,6 +875,7 @@ enum net_device_path_type {
        DEV_PATH_BRIDGE,
        DEV_PATH_PPPOE,
        DEV_PATH_DSA,
@@ -241,7 +241,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  };
  
  struct net_device_path {
-@@ -895,6 +896,12 @@ struct net_device_path {
+@@ -900,6 +901,12 @@ struct net_device_path {
                        int port;
                        u16 proto;
                } dsa;
@@ -256,7 +256,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -763,6 +763,10 @@ int dev_fill_forward_path(const struct n
+@@ -769,6 +769,10 @@ int dev_fill_forward_path(const struct n
                if (WARN_ON_ONCE(last_dev == ctx.dev))
                        return -1;
        }