aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSieng Piaw Liew <liew.s.piaw@gmail.com>2021-02-24 09:23:43 +0800
committerÁlvaro Fernández Rojas <noltari@gmail.com>2021-03-05 12:41:45 +0100
commit63aad66ddf2c156a5775dae03911d2e281b9de0f (patch)
treeb6053e8e64d0c6302c1b52f42808ff5d3856f299
parentcfa43f81198716e96477c2c5c5ee1a5408da9df0 (diff)
downloadupstream-63aad66ddf2c156a5775dae03911d2e281b9de0f.tar.gz
upstream-63aad66ddf2c156a5775dae03911d2e281b9de0f.tar.bz2
upstream-63aad66ddf2c156a5775dae03911d2e281b9de0f.zip
bcm63xx: rename upstreamed patch
Patch to fix kernel panic was recently accepted upstream so rename patch and add acked lines to reflect that. Signed-off-by: Sieng Piaw Liew <liew.s.piaw@gmail.com> (add the same patch for v5.10) Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-rw-r--r--target/linux/bcm63xx/patches-5.10/027-v5.12-bcm63xx_enet-fix-kernel-panic.patch (renamed from target/linux/bcm63xx/patches-5.10/027-bcm63xx_enet-fix-kernel-panic.patch)9
-rw-r--r--target/linux/bcm63xx/patches-5.4/047-v5.12-bcm63xx_enet-fix-kernel-panic.patch (renamed from target/linux/bcm63xx/patches-5.4/047-bcm63xx_enet-fix-kernel-panic.patch)9
2 files changed, 12 insertions, 6 deletions
diff --git a/target/linux/bcm63xx/patches-5.10/027-bcm63xx_enet-fix-kernel-panic.patch b/target/linux/bcm63xx/patches-5.10/027-v5.12-bcm63xx_enet-fix-kernel-panic.patch
index 6d07c737e7..727a380348 100644
--- a/target/linux/bcm63xx/patches-5.10/027-bcm63xx_enet-fix-kernel-panic.patch
+++ b/target/linux/bcm63xx/patches-5.10/027-v5.12-bcm63xx_enet-fix-kernel-panic.patch
@@ -1,7 +1,7 @@
-From ca6be00ca1d3a2f5b8794894e2dae175e63768f5 Mon Sep 17 00:00:00 2001
+From 90eda07518ea7e8d1b3e6445eb3633eef9f65218 Mon Sep 17 00:00:00 2001
From: Sieng Piaw Liew <liew.s.piaw@gmail.com>
-Date: Tue, 16 Feb 2021 16:23:08 +0800
-Subject: [PATCH] bcm63xx_enet: Fix sporadic kernel panic
+Date: Mon, 22 Feb 2021 09:15:12 +0800
+Subject: [PATCH net] bcm63xx_enet: fix sporadic kernel panic
In ndo_stop functions, netdev_completed_queue() is called during forced
tx reclaim, after netdev_reset_queue(). This may trigger kernel panic if
@@ -11,6 +11,9 @@ This patch moves netdev_reset_queue() to after tx reclaim, so BQL can
complete successfully then reset.
Signed-off-by: Sieng Piaw Liew <liew.s.piaw@gmail.com>
+Acked-by: Florian Fainelli <f.fainelli@gmail.com>
+Fixes: 4c59b0f5543d ("bcm63xx_enet: add BQL support")
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/target/linux/bcm63xx/patches-5.4/047-bcm63xx_enet-fix-kernel-panic.patch b/target/linux/bcm63xx/patches-5.4/047-v5.12-bcm63xx_enet-fix-kernel-panic.patch
index 4a1feb3a10..fad336a643 100644
--- a/target/linux/bcm63xx/patches-5.4/047-bcm63xx_enet-fix-kernel-panic.patch
+++ b/target/linux/bcm63xx/patches-5.4/047-v5.12-bcm63xx_enet-fix-kernel-panic.patch
@@ -1,7 +1,7 @@
-From ca6be00ca1d3a2f5b8794894e2dae175e63768f5 Mon Sep 17 00:00:00 2001
+From 90eda07518ea7e8d1b3e6445eb3633eef9f65218 Mon Sep 17 00:00:00 2001
From: Sieng Piaw Liew <liew.s.piaw@gmail.com>
-Date: Tue, 16 Feb 2021 16:23:08 +0800
-Subject: [PATCH] bcm63xx_enet: Fix sporadic kernel panic
+Date: Mon, 22 Feb 2021 09:15:12 +0800
+Subject: [PATCH net] bcm63xx_enet: fix sporadic kernel panic
In ndo_stop functions, netdev_completed_queue() is called during forced
tx reclaim, after netdev_reset_queue(). This may trigger kernel panic if
@@ -11,6 +11,9 @@ This patch moves netdev_reset_queue() to after tx reclaim, so BQL can
complete successfully then reset.
Signed-off-by: Sieng Piaw Liew <liew.s.piaw@gmail.com>
+Acked-by: Florian Fainelli <f.fainelli@gmail.com>
+Fixes: 4c59b0f5543d ("bcm63xx_enet: add BQL support")
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)