mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
99c9d8abd6
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.148 Removed upstreamed: generic/hack-5.15/321-powerpc_crtsavres_prereq.patch[1] Manually rebased: target/linux/octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch[2] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.148&id=0b11a145eb00d51f7ef18cfcae587b93f9adb1e9 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit?h=v5.15.148&id=b67064bd372300a75293efbbc70624996dccffd4 Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 7028471edb646bfc532fec0973e50e784cdcb7c6 Mon Sep 17 00:00:00 2001
|
|
From: Christian Marangi <ansuelsmth@gmail.com>
|
|
Date: Sat, 23 Jul 2022 16:29:30 +0200
|
|
Subject: [PATCH 2/5] net: ethernet: stmicro: stmmac: first disable all queues
|
|
and disconnect in release
|
|
|
|
Disable all queues and disconnect before tx_disable in stmmac_release to
|
|
prevent a corner case where packet may be still queued at the same time
|
|
tx_disable is called resulting in kernel panic if some packet still has
|
|
to be processed.
|
|
|
|
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
|
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
|
@@ -3835,8 +3835,6 @@ static int stmmac_release(struct net_dev
|
|
struct stmmac_priv *priv = netdev_priv(dev);
|
|
u32 chan;
|
|
|
|
- netif_tx_disable(dev);
|
|
-
|
|
if (device_may_wakeup(priv->device))
|
|
phylink_speed_down(priv->phylink, false);
|
|
/* Stop and disconnect the PHY */
|
|
@@ -3848,6 +3846,8 @@ static int stmmac_release(struct net_dev
|
|
for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
|
|
hrtimer_cancel(&priv->tx_queue[chan].txtimer);
|
|
|
|
+ netif_tx_disable(dev);
|
|
+
|
|
/* Free the IRQ lines */
|
|
stmmac_free_irq(dev, REQ_IRQ_ERR_ALL, 0);
|
|
|