|
|
@@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell <[email protected]>
|
|
|
|
|
|
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
|
|
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
|
|
-@@ -3244,7 +3244,7 @@ static void bcmgenet_get_hw_addr(struct
|
|
|
+@@ -3246,7 +3246,7 @@ static void bcmgenet_get_hw_addr(struct
|
|
|
}
|
|
|
|
|
|
/* Returns a reusable dma control register value */
|
|
|
@@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell <[email protected]>
|
|
|
{
|
|
|
unsigned int i;
|
|
|
u32 reg;
|
|
|
-@@ -3269,6 +3269,14 @@ static u32 bcmgenet_dma_disable(struct b
|
|
|
+@@ -3271,6 +3271,14 @@ static u32 bcmgenet_dma_disable(struct b
|
|
|
udelay(10);
|
|
|
bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH);
|
|
|
|
|
|
@@ -48,7 +48,7 @@ Signed-off-by: Phil Elwell <[email protected]>
|
|
|
return dma_ctrl;
|
|
|
}
|
|
|
|
|
|
-@@ -3332,8 +3340,8 @@ static int bcmgenet_open(struct net_devi
|
|
|
+@@ -3334,8 +3342,8 @@ static int bcmgenet_open(struct net_devi
|
|
|
|
|
|
bcmgenet_set_hw_addr(priv, dev->dev_addr);
|
|
|
|
|
|
@@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <[email protected]>
|
|
|
|
|
|
/* Reinitialize TDMA and RDMA and SW housekeeping */
|
|
|
ret = bcmgenet_init_dma(priv);
|
|
|
-@@ -4189,7 +4197,7 @@ static int bcmgenet_resume(struct device
|
|
|
+@@ -4191,7 +4199,7 @@ static int bcmgenet_resume(struct device
|
|
|
bcmgenet_hfb_create_rxnfc_filter(priv, rule);
|
|
|
|
|
|
/* Disable RX/TX DMA and flush TX queues */
|