aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon/patches-5.4/700-allocate_interface_by_label.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-11-05 10:31:15 -0500
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-11-10 13:11:32 +0100
commita47279154e08d54df05fa8bf45fe935ebf0df5da (patch)
treedad44b1cd9fffe941dd0b77f30be8614d3097265 /target/linux/octeon/patches-5.4/700-allocate_interface_by_label.patch
parentd4521fb132266fd6c94796e19d3d1e925847338d (diff)
downloadupstream-a47279154e08d54df05fa8bf45fe935ebf0df5da.tar.gz
upstream-a47279154e08d54df05fa8bf45fe935ebf0df5da.tar.bz2
upstream-a47279154e08d54df05fa8bf45fe935ebf0df5da.zip
kernel: bump 5.4 to 5.4.75
Manually rebased patches: bcm27xx: patches-5.4/950-0267-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch bcm53xx: patches-5.4/180-usb-xhci-add-support-for-performing-fake-doorbell.patch layerscape: patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch patches-5.4/808-i2c-0002-MLK-10893-i2c-imx-add-irqf_no_suspend.patch patches-5.4/820-usb-0016-MLK-16735-usb-host-add-XHCI_CDNS_HOST-flag.patch Removed since could be reverse-applied by quilt: mediatek: patches-5.4/0700-arm-dts-mt7623-add-missing-pause-for-switchport.patch All modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711, x86_64 Run-tested: ipq806x/R7800, x86_64 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> Tested-by: Curtis Deptuck <curtdept@me.com> [x86_64] Rebase of 802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux/octeon/patches-5.4/700-allocate_interface_by_label.patch')
-rw-r--r--target/linux/octeon/patches-5.4/700-allocate_interface_by_label.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/octeon/patches-5.4/700-allocate_interface_by_label.patch b/target/linux/octeon/patches-5.4/700-allocate_interface_by_label.patch
index 0aef899a96..3a9b2eb7cd 100644
--- a/target/linux/octeon/patches-5.4/700-allocate_interface_by_label.patch
+++ b/target/linux/octeon/patches-5.4/700-allocate_interface_by_label.patch
@@ -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);