diff options
| author | Thomas Falcon <tlfalcon@linux.vnet.ibm.com> | 2018-02-13 15:32:50 -0600 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-14 14:31:34 -0500 |
| commit | cc85c02edfe48a34865ae00f7d22298a3fdd17aa (patch) | |
| tree | 5fc4020fa3407c35ddcc6c893726e620f7abf34f /drivers/net | |
| parent | e6dbe9397ea754e80f59d852a74fc289fa8b0f3a (diff) | |
| download | linux-cc85c02edfe48a34865ae00f7d22298a3fdd17aa.tar.bz2 | |
ibmvnic: Wait until reset is complete to set carrier on
Pushes back setting the carrier on until the end of the reset
code. This resolves a bug where a watchdog timer was detecting
that a TX queue had stalled before the adapter reset was complete.
Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 27447260215d..1a2d8d66f527 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1670,8 +1670,6 @@ static int do_reset(struct ibmvnic_adapter *adapter, return 0; } - netif_carrier_on(netdev); - /* kick napi */ for (i = 0; i < adapter->req_rx_queues; i++) napi_schedule(&adapter->napi[i]); @@ -1679,6 +1677,8 @@ static int do_reset(struct ibmvnic_adapter *adapter, if (adapter->reset_reason != VNIC_RESET_FAILOVER) netdev_notify_peers(netdev); + netif_carrier_on(netdev); + return 0; } |