Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e94d8af3 authored by Eilon Greenstein's avatar Eilon Greenstein Committed by David S. Miller
Browse files

bnx2x: Disable napi 



Calling napi disabled unconditionally at netif stop

Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 81f75bbf

drivers/net/bnx2x_main.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -6143,8 +6143,8 @@ static void bnx2x_netif_start(struct bnx2x *bp) 
static void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw)

static void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw)

{

{

	bnx2x_int_disable_sync(bp, disable_hw);

	bnx2x_int_disable_sync(bp, disable_hw);

	if (netif_running(bp->dev)) {

	bnx2x_napi_disable(bp);

	bnx2x_napi_disable(bp);

	if (netif_running(bp->dev)) {

		netif_tx_disable(bp->dev);

		netif_tx_disable(bp->dev);

		bp->dev->trans_start = jiffies;	/* prevent tx timeout */

		bp->dev->trans_start = jiffies;	/* prevent tx timeout */

	}

	}
@@ -6689,8 +6689,7 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) 
	bnx2x_set_storm_rx_mode(bp);

	bnx2x_set_storm_rx_mode(bp);





	bnx2x_netif_stop(bp, 1);

	bnx2x_netif_stop(bp, 1);

	if (!netif_running(bp->dev))



		bnx2x_napi_disable(bp);

	del_timer_sync(&bp->timer);

	del_timer_sync(&bp->timer);

	SHMEM_WR(bp, func_mb[BP_FUNC(bp)].drv_pulse_mb,

	SHMEM_WR(bp, func_mb[BP_FUNC(bp)].drv_pulse_mb,

		 (DRV_PULSE_ALWAYS_ALIVE | bp->fw_drv_pulse_wr_seq));

		 (DRV_PULSE_ALWAYS_ALIVE | bp->fw_drv_pulse_wr_seq));