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 b84caae486135d588fb200973b0be8cb8a511edf
  (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>

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 1f79d47c45fa3c9ec9b747958c71428cd0850ce5..ba78c7481fa3432f32fd7d5a5e7c56b66423b801 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -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;
-
-       netif_tx_start_all_queues(netdev);
-
-       return 0;
+               qlcnic_detach(adapter);
 
-err_out:
-       qlcnic_detach(adapter);
        return err;
 }