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>2023-02-01 15:37:19 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2023-02-03 09:34:32 +0100
commit59fe39f6fcf1407a53ec54cb54d1e27dfa0beca5 (patch)
tree0c8ec0b8c56830dbbd04311b8656f5b4403fb3b7 /target/linux/generic/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch
parentacd8e94d20eea746f8fd01d0603bf46ef1d494af (diff)
downloadupstream-59fe39f6fcf1407a53ec54cb54d1e27dfa0beca5.tar.gz
upstream-59fe39f6fcf1407a53ec54cb54d1e27dfa0beca5.tar.bz2
upstream-59fe39f6fcf1407a53ec54cb54d1e27dfa0beca5.zip
kernel: bump 5.15 to 5.15.91
Manually rebased: pending-5.15/103-kbuild-export-SUBARCH.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod 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 ee3b92f06b..e3c15061b8 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
-@@ -3826,8 +3826,6 @@ static int stmmac_release(struct net_dev
+@@ -3831,8 +3831,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 */
-@@ -3839,6 +3837,8 @@ static int stmmac_release(struct net_dev
+@@ -3844,6 +3842,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);