aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-09-20 15:34:17 -0400
committerPetr Štetiar <ynezz@true.cz>2022-09-22 12:46:55 +0200
commit37a0cae33e94ec5822945d0c6a7c74600b4f4ade (patch)
tree6bcae5766e3666da86830530c5e308b8af128b26 /target/linux/generic/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch
parenteff4f8b2f0a2900c945c21c8183d1faa0ac35ec1 (diff)
downloadupstream-37a0cae33e94ec5822945d0c6a7c74600b4f4ade.tar.gz
upstream-37a0cae33e94ec5822945d0c6a7c74600b4f4ade.tar.bz2
upstream-37a0cae33e94ec5822945d0c6a7c74600b4f4ade.zip
kernel: bump 5.15 to 5.15.69
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/generic/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch')
-rw-r--r--target/linux/generic/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch b/target/linux/generic/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch
index e73422636c..2b148ff290 100644
--- a/target/linux/generic/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch
+++ b/target/linux/generic/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch
@@ -17,7 +17,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -3808,8 +3808,6 @@ static int stmmac_release(struct net_dev
+@@ -3809,8 +3809,6 @@ static int stmmac_release(struct net_dev
struct stmmac_priv *priv = netdev_priv(dev);
u32 chan;
@@ -26,7 +26,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
if (device_may_wakeup(priv->device))
phylink_speed_down(priv->phylink, false);
/* Stop and disconnect the PHY */
-@@ -3821,6 +3819,8 @@ static int stmmac_release(struct net_dev
+@@ -3822,6 +3820,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);