qlcnic: Fix tx timeout.

o __qlcnic_down call's netif_tx_disable which in turn stops
  all the TX queues, corresponding start queue was missing in
  __qlcnic_up which was leading to tx timeout.
o The commit b84caae486
  (qlcnic: Fix usage of netif_tx_{wake, stop} api during link change.)
  exposed this issue.

Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rajesh Borundia 2014-01-28 11:55:29 -05:00 committed by David S. Miller
parent bcf6cb1aa4
commit 060d0564a9

View File

@ -1837,6 +1837,7 @@ int __qlcnic_up(struct qlcnic_adapter *adapter, struct net_device *netdev)
qlcnic_linkevent_request(adapter, 1);
adapter->ahw->reset_context = 0;
netif_tx_start_all_queues(netdev);
return 0;
}
@ -2704,14 +2705,8 @@ static int qlcnic_open(struct net_device *netdev)
err = __qlcnic_up(adapter, netdev);
if (err)
goto err_out;
qlcnic_detach(adapter);
netif_tx_start_all_queues(netdev);
return 0;
err_out:
qlcnic_detach(adapter);
return err;
}