@@ -3310,7 +3310,7 @@ static void bcmgenet_get_hw_addr(struct bcmgenet_priv *priv,
3310
3310
}
3311
3311
3312
3312
/* Returns a reusable dma control register value */
3313
- static u32 bcmgenet_dma_disable (struct bcmgenet_priv * priv , bool flush_rx )
3313
+ static u32 bcmgenet_dma_disable (struct bcmgenet_priv * priv )
3314
3314
{
3315
3315
unsigned int i ;
3316
3316
u32 reg ;
@@ -3335,14 +3335,6 @@ static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv, bool flush_rx)
3335
3335
udelay (10 );
3336
3336
bcmgenet_umac_writel (priv , 0 , UMAC_TX_FLUSH );
3337
3337
3338
- if (flush_rx ) {
3339
- reg = bcmgenet_rbuf_ctrl_get (priv );
3340
- bcmgenet_rbuf_ctrl_set (priv , reg | BIT (0 ));
3341
- udelay (10 );
3342
- bcmgenet_rbuf_ctrl_set (priv , reg );
3343
- udelay (10 );
3344
- }
3345
-
3346
3338
return dma_ctrl ;
3347
3339
}
3348
3340
@@ -3406,8 +3398,8 @@ static int bcmgenet_open(struct net_device *dev)
3406
3398
3407
3399
bcmgenet_set_hw_addr (priv , dev -> dev_addr );
3408
3400
3409
- /* Disable RX/TX DMA and flush TX and RX queues */
3410
- dma_ctrl = bcmgenet_dma_disable (priv , true );
3401
+ /* Disable RX/TX DMA and flush TX queues */
3402
+ dma_ctrl = bcmgenet_dma_disable (priv );
3411
3403
3412
3404
/* Reinitialize TDMA and RDMA and SW housekeeping */
3413
3405
ret = bcmgenet_init_dma (priv );
@@ -4292,7 +4284,7 @@ static int bcmgenet_resume(struct device *d)
4292
4284
bcmgenet_hfb_create_rxnfc_filter (priv , rule );
4293
4285
4294
4286
/* Disable RX/TX DMA and flush TX queues */
4295
- dma_ctrl = bcmgenet_dma_disable (priv , false );
4287
+ dma_ctrl = bcmgenet_dma_disable (priv );
4296
4288
4297
4289
/* Reinitialize TDMA and RDMA and SW housekeeping */
4298
4290
ret = bcmgenet_init_dma (priv );
0 commit comments