diff options
| author | John Audia <therealgraysky@proton.me> | 2022-10-27 06:26:25 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-11-01 13:56:10 +0100 |
| commit | 0667688a406affbde9a2f6e2e6e07dbd0e3810b1 (patch) | |
| tree | e9ad64ac22874d61ea008617aa1af9287c269a5f /target/linux/bcm27xx/patches-5.10/950-0553-r8152-adjust-rtl8152_check_firmware-function.patch | |
| parent | fe58ee905755512da865aad4543da526a7adc2d4 (diff) | |
| download | upstream-0667688a406affbde9a2f6e2e6e07dbd0e3810b1.tar.gz upstream-0667688a406affbde9a2f6e2e6e07dbd0e3810b1.tar.bz2 upstream-0667688a406affbde9a2f6e2e6e07dbd0e3810b1.zip | |
kernel: bump 5.10 to 5.10.150
Manually rebased:
bcm53xx/patches-5.10/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
All patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
[Move gro_skip in 680-NET-skip-GRO-for-foreign-MAC-addresses.patch to old position]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit aa2fa2eb76f13e48cd39d844dca34627da00cb5d)
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0553-r8152-adjust-rtl8152_check_firmware-function.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0553-r8152-adjust-rtl8152_check_firmware-function.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0553-r8152-adjust-rtl8152_check_firmware-function.patch b/target/linux/bcm27xx/patches-5.10/950-0553-r8152-adjust-rtl8152_check_firmware-function.patch index cddd39ea94..40ca6c1e59 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0553-r8152-adjust-rtl8152_check_firmware-function.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0553-r8152-adjust-rtl8152_check_firmware-function.patch @@ -30,7 +30,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /** * struct fw_mac - a firmware block used by RTL_FW_PLA and RTL_FW_USB. * The layout of the firmware block is: -@@ -3801,10 +3809,7 @@ static long rtl8152_check_firmware(struc +@@ -3803,10 +3811,7 @@ static long rtl8152_check_firmware(struc { const struct firmware *fw = rtl_fw->fw; struct fw_header *fw_hdr = (struct fw_header *)fw->data; @@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> long ret = -EFAULT; int i; -@@ -3833,50 +3838,52 @@ static long rtl8152_check_firmware(struc +@@ -3835,50 +3840,52 @@ static long rtl8152_check_firmware(struc goto fail; goto fw_end; case RTL_FW_PLA: @@ -106,7 +106,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> dev_err(&tp->intf->dev, "Check PHY_STOP fail\n"); goto fail; -@@ -3887,28 +3894,28 @@ static long rtl8152_check_firmware(struc +@@ -3889,28 +3896,28 @@ static long rtl8152_check_firmware(struc "Invalid length for PHY_STOP\n"); goto fail; } @@ -141,7 +141,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> break; default: -@@ -3922,7 +3929,7 @@ static long rtl8152_check_firmware(struc +@@ -3924,7 +3931,7 @@ static long rtl8152_check_firmware(struc } fw_end: |