diff options
| author | John Audia <therealgraysky@proton.me> | 2022-08-31 12:26:53 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-09-02 21:21:31 +0200 |
| commit | f87175b30398bd93fa603e90e3a6028c4ea12caf (patch) | |
| tree | acc89dfd0aac581e3325499be8baf8ced89c4ffc /target/linux/bcm27xx/patches-5.15/950-0034-Allow-mac-address-to-be-set-in-smsc95xx.patch | |
| parent | 7f4b4c29f3489697dca7495216460d0ed5023e02 (diff) | |
| download | upstream-f87175b30398bd93fa603e90e3a6028c4ea12caf.tar.gz upstream-f87175b30398bd93fa603e90e3a6028c4ea12caf.tar.bz2 upstream-f87175b30398bd93fa603e90e3a6028c4ea12caf.zip | |
kernel: bump 5.15 to 5.15.64
All patches automatically rebased
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0034-Allow-mac-address-to-be-set-in-smsc95xx.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0034-Allow-mac-address-to-be-set-in-smsc95xx.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0034-Allow-mac-address-to-be-set-in-smsc95xx.patch b/target/linux/bcm27xx/patches-5.15/950-0034-Allow-mac-address-to-be-set-in-smsc95xx.patch index fe7d025766..2983a0f1f0 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0034-Allow-mac-address-to-be-set-in-smsc95xx.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0034-Allow-mac-address-to-be-set-in-smsc95xx.patch @@ -10,15 +10,15 @@ Signed-off-by: popcornmix <popcornmix@gmail.com> --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c -@@ -52,6 +52,7 @@ +@@ -50,6 +50,7 @@ #define SUSPEND_SUSPEND3 (0x08) #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3) +#define MAC_ADDR_LEN (6) - #define SMSC95XX_NR_IRQS (1) /* raise to 12 for GPIOs */ - #define PHY_HWIRQ (SMSC95XX_NR_IRQS - 1) -@@ -84,6 +85,10 @@ static int packetsize = 2560; + struct smsc95xx_priv { + u32 mac_cr; +@@ -75,6 +76,10 @@ static int packetsize = 2560; module_param(packetsize, int, 0644); MODULE_PARM_DESC(packetsize, "Override the RX URB packet size"); @@ -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) { -@@ -788,6 +793,53 @@ static int smsc95xx_ioctl(struct net_dev +@@ -771,6 +776,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 */ -@@ -810,6 +862,10 @@ static void smsc95xx_init_mac_address(st +@@ -793,6 +845,10 @@ static void smsc95xx_init_mac_address(st } } |