kernel: bump 5.15 to 5.15.137

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 794-v6.2-net-core-Allow-live-renaming-when-an-interface-is-up.patch

diff --git a/target/linux/generic/backport-5.15/794-v6.2-net-core-Allow-live-renaming-when-an-interface-is-up.patch b/target/linux/generic/backport-5.15/794-v6.2-net-core-Allow-live-renaming-when-an-interface-is-up.patch
index bd58db2e7787e1d5a00a672838c8ad9d9442415b..582e1ce2efdd48f33dbb04d28447b8895edd035b 100644 (file)
--- a/target/linux/generic/backport-5.15/794-v6.2-net-core-Allow-live-renaming-when-an-interface-is-up.patch
+++ b/target/linux/generic/backport-5.15/794-v6.2-net-core-Allow-live-renaming-when-an-interface-is-up.patch
@@ -73,7 +73,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  /* Specifies the type of the struct net_device::ml_priv pointer */
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -1222,22 +1222,6 @@ int dev_change_name(struct net_device *d
+@@ -1242,22 +1242,6 @@ int dev_change_name(struct net_device *d
  
        net = dev_net(dev);
  
@@ -96,7 +96,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        down_write(&devnet_rename_sem);
  
        if (strncmp(newname, dev->name, IFNAMSIZ) == 0) {
-@@ -1254,7 +1238,8 @@ int dev_change_name(struct net_device *d
+@@ -1274,7 +1258,8 @@ int dev_change_name(struct net_device *d
        }
  
        if (oldname[0] && !strchr(oldname, '%'))