From: Michael Chan Date: Sat, 20 Feb 2016 00:43:19 +0000 (-0500) Subject: bnxt_en: Poll link at the end of __bnxt_open_nic(). X-Git-Tag: v4.1.12-92~126^2~71 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=64dff714041aeb773499dcc05a061adc9b7e4db4;p=users%2Fjedix%2Flinux-maple.git bnxt_en: Poll link at the end of __bnxt_open_nic(). Orabug: 23221795 When shutting down the NIC, we shutdown async event processing before freeing all the rings. If there is a link change event during reset, the driver may miss it and the link state may be incorrect after the NIC is re-opened. Poll the link at the end of __bnxt_open_nic() to get the correct link status. Signed-off-by Michael Chan Signed-off-by: David S. Miller (cherry picked from commit 035a1539ab63bfdb284bdf6e8459e35897c60564) Signed-off-by: Brian Maly --- diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 085fc7960f8ca..781c6ead0221c 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -4681,6 +4681,7 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init) /* Enable TX queues */ bnxt_tx_enable(bp); mod_timer(&bp->timer, jiffies + bp->current_interval); + bnxt_update_link(bp, true); return 0;