aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/783-v5.12-net-usb-r8152-use-new-tasklet-API.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-10-27 06:26:25 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-10-30 17:52:42 +0100
commitaa2fa2eb76f13e48cd39d844dca34627da00cb5d (patch)
tree4252a116ecb086acb763b735ef6ec544a2143247 /target/linux/generic/backport-5.10/783-v5.12-net-usb-r8152-use-new-tasklet-API.patch
parent641e4f2f0479997c71ff6c1f1b63fb9b5c67e687 (diff)
downloadupstream-aa2fa2eb76f13e48cd39d844dca34627da00cb5d.tar.gz
upstream-aa2fa2eb76f13e48cd39d844dca34627da00cb5d.tar.bz2
upstream-aa2fa2eb76f13e48cd39d844dca34627da00cb5d.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>
Diffstat (limited to 'target/linux/generic/backport-5.10/783-v5.12-net-usb-r8152-use-new-tasklet-API.patch')
-rw-r--r--target/linux/generic/backport-5.10/783-v5.12-net-usb-r8152-use-new-tasklet-API.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.10/783-v5.12-net-usb-r8152-use-new-tasklet-API.patch b/target/linux/generic/backport-5.10/783-v5.12-net-usb-r8152-use-new-tasklet-API.patch
index eeb85d7951..1f43340c68 100644
--- a/target/linux/generic/backport-5.10/783-v5.12-net-usb-r8152-use-new-tasklet-API.patch
+++ b/target/linux/generic/backport-5.10/783-v5.12-net-usb-r8152-use-new-tasklet-API.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
-@@ -2393,11 +2393,9 @@ static void tx_bottom(struct r8152 *tp)
+@@ -2395,11 +2395,9 @@ static void tx_bottom(struct r8152 *tp)
} while (res == 0);
}
@@ -30,7 +30,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
if (test_bit(RTL8152_UNPLUG, &tp->flags))
return;
-@@ -6695,7 +6693,7 @@ static int rtl8152_probe(struct usb_inte
+@@ -6697,7 +6695,7 @@ static int rtl8152_probe(struct usb_inte
mutex_init(&tp->control);
INIT_DELAYED_WORK(&tp->schedule, rtl_work_func_t);
INIT_DELAYED_WORK(&tp->hw_phy_work, rtl_hw_phy_work_func_t);