diff options
| author | John Audia <therealgraysky@proton.me> | 2022-11-26 06:51:56 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-11-27 13:18:29 +0100 |
| commit | 590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad (patch) | |
| tree | b8d0c8571b36a5029c9d3c82d2cb7f5a68986ac4 /target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch | |
| parent | 6640c788feadbdde9ac80a66e6b24802ae021bd5 (diff) | |
| download | upstream-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-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch')
| -rw-r--r-- | target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch b/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch index 0635693d55..4c41d3c743 100644 --- a/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch +++ b/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch @@ -1115,7 +1115,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg, tx_q->dma_tx_phy, tx_q->queue_index); -@@ -6506,7 +6622,7 @@ void stmmac_xdp_release(struct net_devic +@@ -6509,7 +6625,7 @@ void stmmac_xdp_release(struct net_devic stmmac_stop_all_dma(priv); /* Release and free the Rx/Tx resources */ @@ -1124,7 +1124,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> /* Disable the MAC Rx/Tx */ stmmac_mac_set(priv, priv->ioaddr, false); -@@ -6531,14 +6647,14 @@ int stmmac_xdp_open(struct net_device *d +@@ -6534,14 +6650,14 @@ int stmmac_xdp_open(struct net_device *d u32 chan; int ret; @@ -1141,7 +1141,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> if (ret < 0) { netdev_err(dev, "%s: DMA descriptors initialization failed\n", __func__); -@@ -6620,7 +6736,7 @@ irq_error: +@@ -6623,7 +6739,7 @@ irq_error: stmmac_hw_teardown(dev); init_error: @@ -1150,7 +1150,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> dma_desc_error: return ret; } -@@ -7479,7 +7595,7 @@ int stmmac_resume(struct device *dev) +@@ -7482,7 +7598,7 @@ int stmmac_resume(struct device *dev) stmmac_reset_queues_param(priv); stmmac_free_tx_skbufs(priv); |