aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-11-26 06:51:56 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-11-27 13:18:29 +0100
commit590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad (patch)
treeb8d0c8571b36a5029c9d3c82d2cb7f5a68986ac4 /target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch
parent6640c788feadbdde9ac80a66e6b24802ae021bd5 (diff)
downloadupstream-590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad.tar.gz
upstream-590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad.tar.bz2
upstream-590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad.zip
kernel: bump 5.15 to 5.15.80
Manually rebase: pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch ath79/patches-5.15/910-unaligned_access_hacks.patch All other patches automatically rebased Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch')
-rw-r--r--target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch b/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch
index b6b94ba6c2..78a5494bf2 100644
--- a/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch
+++ b/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch
@@ -87,7 +87,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
stmmac_clear_tx_descriptors(priv, queue);
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
-@@ -7387,6 +7382,25 @@ int stmmac_suspend(struct device *dev)
+@@ -7390,6 +7385,25 @@ int stmmac_suspend(struct device *dev)
}
EXPORT_SYMBOL_GPL(stmmac_suspend);
@@ -113,7 +113,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
/**
* stmmac_reset_queues_param - reset queue parameters
* @priv: device pointer
-@@ -7397,22 +7411,11 @@ static void stmmac_reset_queues_param(st
+@@ -7400,22 +7414,11 @@ static void stmmac_reset_queues_param(st
u32 tx_cnt = priv->plat->tx_queues_to_use;
u32 queue;