aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch
diff options
context:
space:
mode:
authorSieng Piaw Liew <liew.s.piaw@gmail.com>2021-01-12 10:35:55 +0800
committerÁlvaro Fernández Rojas <noltari@gmail.com>2021-01-22 12:42:30 +0100
commit1d6f422e346ba1f39165577ffbe2ad15b944171c (patch)
treec53bef15793ca711a4a60017521f326dbfc29cc3 /target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch
parent2d8422842c7b2ca91956d9629f41083f99f12eac (diff)
downloadupstream-1d6f422e346ba1f39165577ffbe2ad15b944171c.tar.gz
upstream-1d6f422e346ba1f39165577ffbe2ad15b944171c.tar.bz2
upstream-1d6f422e346ba1f39165577ffbe2ad15b944171c.zip
bcm63xx: sync ethernet driver with net-next
Sync ethernet driver code with upstream Linux kernel: -Reduce xmit_more code changes. -Combine rx cleanup code into a function. -Convert to build_skb. -Improve rx loop by optimizing loop tracking. https://lore.kernel.org/netdev/20210106144208.1935-1-liew.s.piaw@gmail.com/ Signed-off-by: Sieng Piaw Liew <liew.s.piaw@gmail.com> [Amend commit description, move patches to the top since they are going to be upstreamed] Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch')
-rw-r--r--target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch b/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch
index 490b59c3f8..92dc05f909 100644
--- a/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch
+++ b/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
-@@ -332,6 +332,9 @@ struct bcm_enet_priv {
+@@ -338,6 +338,9 @@ struct bcm_enet_priv {
struct bcm63xx_enetsw_port used_ports[ENETSW_MAX_PORT];
int sw_port_link[ENETSW_MAX_PORT];
@@ -20,7 +20,7 @@
#include <bcm63xx_dev_enet.h>
#include "bcm63xx_enet.h"
-@@ -1909,7 +1910,8 @@ static int bcm_enet_remove(struct platfo
+@@ -1930,7 +1931,8 @@ static int bcm_enet_remove(struct platfo
return 0;
}
@@ -30,7 +30,7 @@
.probe = bcm_enet_probe,
.remove = bcm_enet_remove,
.driver = {
-@@ -1918,6 +1920,42 @@ struct platform_driver bcm63xx_enet_driv
+@@ -1939,6 +1941,42 @@ struct platform_driver bcm63xx_enet_driv
},
};
@@ -73,7 +73,7 @@
/*
* switch mii access callbacks
*/
-@@ -2174,29 +2212,6 @@ static int bcm_enetsw_open(struct net_de
+@@ -2195,29 +2233,6 @@ static int bcm_enetsw_open(struct net_de
enetsw_writeb(priv, rgmii_ctrl, ENETSW_RGMII_CTRL_REG(i));
}
@@ -103,7 +103,7 @@
/* initialize flow control buffer allocation */
enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0,
ENETDMA_BUFALLOC_REG(priv->rx_chan));
-@@ -2652,6 +2667,9 @@ static int bcm_enetsw_probe(struct platf
+@@ -2651,6 +2666,9 @@ static int bcm_enetsw_probe(struct platf
struct bcm63xx_enetsw_platform_data *pd;
struct resource *res_mem;
int ret, irq_rx, irq_tx;