kernel: bump 5.4 to 5.4.75
[openwrt/staging/wigyori.git] / target / linux / octeon / patches-5.4 / 700-allocate_interface_by_label.patch
index 0aef899a96727faa0d20f14ca1b8c287cc7dd372..3a9b2eb7cd032907067fabf060be4ef67aef5730 100644 (file)
@@ -12,7 +12,7 @@ Tested-by: Johannes Kimmel <fff@bareminimum.eu>
 Signed-off-by: Roman Kuzmitskii <damex.pp@icloud.com>
 --- a/drivers/staging/octeon/ethernet.c
 +++ b/drivers/staging/octeon/ethernet.c
-@@ -407,9 +407,12 @@
+@@ -408,9 +408,12 @@ int cvm_oct_common_init(struct net_devic
  {
        struct octeon_ethernet *priv = netdev_priv(dev);
        const u8 *mac = NULL;
@@ -26,7 +26,7 @@ Signed-off-by: Roman Kuzmitskii <damex.pp@icloud.com>
  
        if (!IS_ERR_OR_NULL(mac))
                ether_addr_copy(dev->dev_addr, mac);
-@@ -444,6 +447,9 @@
+@@ -445,6 +448,9 @@ int cvm_oct_common_init(struct net_devic
        if (dev->netdev_ops->ndo_stop)
                dev->netdev_ops->ndo_stop(dev);