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

Commit d6fe6d18 authored by Edwin Peer's avatar Edwin Peer Committed by Greg Kroah-Hartman
Browse files

bnxt_en: reverse order of TX disable and carrier off 



[ Upstream commit 132e0b65dc2b8bfa9721bfce834191f24fd1d7ed ]

A TX queue can potentially immediately timeout after it is stopped
and the last TX timestamp on that queue was more than 5 seconds ago with
carrier still up.  Prevent these intermittent false TX timeouts
by bringing down carrier first before calling netif_tx_disable().

Fixes: c0c050c5 ("bnxt_en: New Broadcom ethernet driver.")
Signed-off-by: default avatarEdwin Peer <edwin.peer@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 474ac57c

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+2 −1
Original line number Diff line number Diff line
@@ -5752,9 +5752,10 @@ void bnxt_tx_disable(struct bnxt *bp) 
			txr->dev_state = BNXT_DEV_STATE_CLOSING;

		}

	}

	/* Drop carrier first to prevent TX timeout */

	netif_carrier_off(bp->dev);

	/* Stop all TX queues */

	netif_tx_disable(bp->dev);

	netif_carrier_off(bp->dev);

}



void bnxt_tx_enable(struct bnxt *bp)