aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm63xx/patches-5.4/044-v5.12-bcm63xx_enet-consolidate-rx-SKB-ring-cleanup-code.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2022-03-21 01:16:48 +0000
committerDaniel Golle <daniel@makrotopia.org>2022-03-21 13:11:56 +0000
commit786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186 (patch)
tree926fecb2b1f6ce1e42ba7ef4c7aab8e68dfd214c /target/linux/bcm63xx/patches-5.4/044-v5.12-bcm63xx_enet-consolidate-rx-SKB-ring-cleanup-code.patch
parent9470160c350d15f765c33d6c1db15d6c4709a64c (diff)
downloadupstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.gz
upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.bz2
upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.zip
kernel: delete Linux 5.4 config and patches
As the upcoming release will be based on Linux 5.10 only, remove all kernel configuration as well as patches for Linux 5.4. There were no targets still actively using Linux 5.4. Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit 3a14580411adfb75f9a44eded9f41245b9e44606)
Diffstat (limited to 'target/linux/bcm63xx/patches-5.4/044-v5.12-bcm63xx_enet-consolidate-rx-SKB-ring-cleanup-code.patch')
-rw-r--r--target/linux/bcm63xx/patches-5.4/044-v5.12-bcm63xx_enet-consolidate-rx-SKB-ring-cleanup-code.patch142
1 files changed, 0 insertions, 142 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/044-v5.12-bcm63xx_enet-consolidate-rx-SKB-ring-cleanup-code.patch b/target/linux/bcm63xx/patches-5.4/044-v5.12-bcm63xx_enet-consolidate-rx-SKB-ring-cleanup-code.patch
deleted file mode 100644
index 0976252673..0000000000
--- a/target/linux/bcm63xx/patches-5.4/044-v5.12-bcm63xx_enet-consolidate-rx-SKB-ring-cleanup-code.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 3d0b72654b0c8304424503e7560ee8635dd56340 Mon Sep 17 00:00:00 2001
-From: Sieng Piaw Liew <liew.s.piaw@gmail.com>
-Date: Wed, 6 Jan 2021 22:42:06 +0800
-Subject: [PATCH 5/7] bcm63xx_enet: consolidate rx SKB ring cleanup code
-
-The rx SKB ring use the same code for cleanup at various points.
-Combine them into a function to reduce lines of code.
-
-Signed-off-by: Sieng Piaw Liew <liew.s.piaw@gmail.com>
-Acked-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
----
- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 72 ++++++--------------
- 1 file changed, 22 insertions(+), 50 deletions(-)
-
---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-@@ -861,6 +861,24 @@ static void bcm_enet_adjust_link(struct
- priv->pause_tx ? "tx" : "off");
- }
-
-+static void bcm_enet_free_rx_skb_ring(struct device *kdev, struct bcm_enet_priv *priv)
-+{
-+ int i;
-+
-+ for (i = 0; i < priv->rx_ring_size; i++) {
-+ struct bcm_enet_desc *desc;
-+
-+ if (!priv->rx_skb[i])
-+ continue;
-+
-+ desc = &priv->rx_desc_cpu[i];
-+ dma_unmap_single(kdev, desc->address, priv->rx_skb_size,
-+ DMA_FROM_DEVICE);
-+ kfree_skb(priv->rx_skb[i]);
-+ }
-+ kfree(priv->rx_skb);
-+}
-+
- /*
- * open callback, allocate dma rings & buffers and start rx operation
- */
-@@ -1085,18 +1103,7 @@ static int bcm_enet_open(struct net_devi
- return 0;
-
- out:
-- for (i = 0; i < priv->rx_ring_size; i++) {
-- struct bcm_enet_desc *desc;
--
-- if (!priv->rx_skb[i])
-- continue;
--
-- desc = &priv->rx_desc_cpu[i];
-- dma_unmap_single(kdev, desc->address, priv->rx_skb_size,
-- DMA_FROM_DEVICE);
-- kfree_skb(priv->rx_skb[i]);
-- }
-- kfree(priv->rx_skb);
-+ bcm_enet_free_rx_skb_ring(kdev, priv);
-
- out_free_tx_skb:
- kfree(priv->tx_skb);
-@@ -1175,7 +1182,6 @@ static int bcm_enet_stop(struct net_devi
- {
- struct bcm_enet_priv *priv;
- struct device *kdev;
-- int i;
-
- priv = netdev_priv(dev);
- kdev = &priv->pdev->dev;
-@@ -1204,20 +1210,9 @@ static int bcm_enet_stop(struct net_devi
- bcm_enet_tx_reclaim(dev, 1);
-
- /* free the rx skb ring */
-- for (i = 0; i < priv->rx_ring_size; i++) {
-- struct bcm_enet_desc *desc;
--
-- if (!priv->rx_skb[i])
-- continue;
--
-- desc = &priv->rx_desc_cpu[i];
-- dma_unmap_single(kdev, desc->address, priv->rx_skb_size,
-- DMA_FROM_DEVICE);
-- kfree_skb(priv->rx_skb[i]);
-- }
-+ bcm_enet_free_rx_skb_ring(kdev, priv);
-
- /* free remaining allocated memory */
-- kfree(priv->rx_skb);
- kfree(priv->tx_skb);
- dma_free_coherent(kdev, priv->rx_desc_alloc_size,
- priv->rx_desc_cpu, priv->rx_desc_dma);
-@@ -2308,18 +2303,7 @@ static int bcm_enetsw_open(struct net_de
- return 0;
-
- out:
-- for (i = 0; i < priv->rx_ring_size; i++) {
-- struct bcm_enet_desc *desc;
--
-- if (!priv->rx_skb[i])
-- continue;
--
-- desc = &priv->rx_desc_cpu[i];
-- dma_unmap_single(kdev, desc->address, priv->rx_skb_size,
-- DMA_FROM_DEVICE);
-- kfree_skb(priv->rx_skb[i]);
-- }
-- kfree(priv->rx_skb);
-+ bcm_enet_free_rx_skb_ring(kdev, priv);
-
- out_free_tx_skb:
- kfree(priv->tx_skb);
-@@ -2348,7 +2332,6 @@ static int bcm_enetsw_stop(struct net_de
- {
- struct bcm_enet_priv *priv;
- struct device *kdev;
-- int i;
-
- priv = netdev_priv(dev);
- kdev = &priv->pdev->dev;
-@@ -2371,20 +2354,9 @@ static int bcm_enetsw_stop(struct net_de
- bcm_enet_tx_reclaim(dev, 1);
-
- /* free the rx skb ring */
-- for (i = 0; i < priv->rx_ring_size; i++) {
-- struct bcm_enet_desc *desc;
--
-- if (!priv->rx_skb[i])
-- continue;
--
-- desc = &priv->rx_desc_cpu[i];
-- dma_unmap_single(kdev, desc->address, priv->rx_skb_size,
-- DMA_FROM_DEVICE);
-- kfree_skb(priv->rx_skb[i]);
-- }
-+ bcm_enet_free_rx_skb_ring(kdev, priv);
-
- /* free remaining allocated memory */
-- kfree(priv->rx_skb);
- kfree(priv->tx_skb);
- dma_free_coherent(kdev, priv->rx_desc_alloc_size,
- priv->rx_desc_cpu, priv->rx_desc_dma);