--- 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
+@@ -3253,7 +3253,7 @@ static void bcmgenet_get_hw_addr(struct
}
/* Returns a reusable dma control register value */
{
unsigned int i;
u32 reg;
-@@ -3269,6 +3269,14 @@ static u32 bcmgenet_dma_disable(struct b
+@@ -3278,6 +3278,14 @@ static u32 bcmgenet_dma_disable(struct b
udelay(10);
bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH);
return dma_ctrl;
}
-@@ -3332,8 +3340,8 @@ static int bcmgenet_open(struct net_devi
+@@ -3341,8 +3349,8 @@ static int bcmgenet_open(struct net_devi
bcmgenet_set_hw_addr(priv, dev->dev_addr);
/* Reinitialize TDMA and RDMA and SW housekeeping */
ret = bcmgenet_init_dma(priv);
-@@ -4189,7 +4197,7 @@ static int bcmgenet_resume(struct device
+@@ -4198,7 +4206,7 @@ static int bcmgenet_resume(struct device
bcmgenet_hfb_create_rxnfc_filter(priv, rule);
/* Disable RX/TX DMA and flush TX queues */