aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0008-Allow-mac-address-to-be-set-in-smsc95xx.patch
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-03-23 09:47:19 +0000
committerDaniel Golle <daniel@makrotopia.org>2022-03-27 16:14:00 +0100
commit1e35d95a5bfac3896df0855f13afdfe6e132d5b1 (patch)
tree109cfafa0ac59b65e57e378db31c1cda5b1cb99f /target/linux/bcm27xx/patches-5.10/950-0008-Allow-mac-address-to-be-set-in-smsc95xx.patch
parent0c49efd210a8a2502db76e4a884eedc8342a4442 (diff)
downloadupstream-1e35d95a5bfac3896df0855f13afdfe6e132d5b1.tar.gz
upstream-1e35d95a5bfac3896df0855f13afdfe6e132d5b1.tar.bz2
upstream-1e35d95a5bfac3896df0855f13afdfe6e132d5b1.zip
kernel: bump 5.10 to 5.10.108
Patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Tested-by: John Audia <graysky@archlinux.us> Build-tested: ath79/generic, ramips/mt76{20,21,x8}, ipq40xx, mvebu, realtek/rtl{838,930}x, x86/64 Run-tested: ramips/mt7621, mvebu Tested-by: Stijn Segers <foss@volatilesystems.org> Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> (cherry picked from commit 2c26eb4e484fe6d7a8159a22f97b6db7ca6e9221)
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0008-Allow-mac-address-to-be-set-in-smsc95xx.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0008-Allow-mac-address-to-be-set-in-smsc95xx.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0008-Allow-mac-address-to-be-set-in-smsc95xx.patch b/target/linux/bcm27xx/patches-5.10/950-0008-Allow-mac-address-to-be-set-in-smsc95xx.patch
index 1cf4d21a57..32caf0cb84 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0008-Allow-mac-address-to-be-set-in-smsc95xx.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0008-Allow-mac-address-to-be-set-in-smsc95xx.patch
@@ -29,7 +29,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
u32 *data, int in_pm)
{
-@@ -761,6 +766,53 @@ static int smsc95xx_ioctl(struct net_dev
+@@ -773,6 +778,53 @@ static int smsc95xx_ioctl(struct net_dev
return phy_mii_ioctl(netdev->phydev, rq, cmd);
}
@@ -83,7 +83,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
static void smsc95xx_init_mac_address(struct usbnet *dev)
{
/* maybe the boot loader passed the MAC address in devicetree */
-@@ -783,6 +835,10 @@ static void smsc95xx_init_mac_address(st
+@@ -795,6 +847,10 @@ static void smsc95xx_init_mac_address(st
}
}