projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 5.4 to 5.4.136
[openwrt/openwrt.git]
/
target
/
linux
/
bcm27xx
/
patches-5.4
/
950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch
diff --git
a/target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch
b/target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch
index 60505cf4ed0cdf386c4e72a3293fa013c993ad9a..706244f5c894c944e9c9d7568d996272b07eb163 100644
(file)
--- a/
target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch
+++ b/
target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch
@@
-24,7
+24,7
@@
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-@@ -279
0,7 +2790
,7 @@ static void bcmgenet_set_hw_addr(struct
+@@ -279
1,7 +2791
,7 @@ static void bcmgenet_set_hw_addr(struct
}
/* Returns a reusable dma control register value */
}
/* Returns a reusable dma control register value */
@@
-33,7
+33,7
@@
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
{
unsigned int i;
u32 reg;
{
unsigned int i;
u32 reg;
-@@ -281
5,6 +2815
,14 @@ static u32 bcmgenet_dma_disable(struct b
+@@ -281
6,6 +2816
,14 @@ static u32 bcmgenet_dma_disable(struct b
udelay(10);
bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH);
udelay(10);
bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH);
@@
-48,9
+48,9
@@
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
return dma_ctrl;
}
return dma_ctrl;
}
-@@ -291
6,8 +2924
,8 @@ static int bcmgenet_open(struct net_devi
- bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);
- }
+@@ -291
1,8 +2919
,8 @@ static int bcmgenet_open(struct net_devi
+
+ bcmgenet_set_hw_addr(priv, dev->dev_addr);
- /* Disable RX/TX DMA and flush TX queues */
- dma_ctrl = bcmgenet_dma_disable(priv);
- /* Disable RX/TX DMA and flush TX queues */
- dma_ctrl = bcmgenet_dma_disable(priv);
@@
-59,7
+59,7
@@
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
/* Reinitialize TDMA and RDMA and SW housekeeping */
ret = bcmgenet_init_dma(priv);
/* Reinitialize TDMA and RDMA and SW housekeeping */
ret = bcmgenet_init_dma(priv);
-@@ -36
77,7 +3685
,7 @@ static int bcmgenet_resume(struct device
+@@ -36
65,7 +3673
,7 @@ static int bcmgenet_resume(struct device
bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC);
/* Disable RX/TX DMA and flush TX queues */
bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC);
/* Disable RX/TX DMA and flush TX queues */