kernel: bump 6.1 to 6.1.60

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

diff --git a/target/linux/generic/backport-6.1/794-v6.2-net-core-Allow-live-renaming-when-an-interface-is-up.patch b/target/linux/generic/backport-6.1/794-v6.2-net-core-Allow-live-renaming-when-an-interface-is-up.patch
index e04dcec7636f248040faa60eb181854e952235fc..c15604717be06cd42e9d1707455165c4bb898a14 100644 (file)
--- a/target/linux/generic/backport-6.1/794-v6.2-net-core-Allow-live-renaming-when-an-interface-is-up.patch
+++ b/target/linux/generic/backport-6.1/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
-@@ -1163,22 +1163,6 @@ int dev_change_name(struct net_device *d
+@@ -1188,22 +1188,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) {
-@@ -1195,7 +1179,8 @@ int dev_change_name(struct net_device *d
+@@ -1220,7 +1204,8 @@ int dev_change_name(struct net_device *d
        }
  
        if (oldname[0] && !strchr(oldname, '%'))