Commit 060d0564 authored by Rajesh Borundia's avatar Rajesh Borundia Committed by David S. Miller
Browse files

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 b84caae4
  (qlcnic: Fix usage of netif_tx_{wake, stop} api during link change.)
  exposed this issue.

Signed-off-by: default avatarRajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bcf6cb1a

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+2 −7
Original line number Diff line number Diff line
@@ -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;



err_out:

		qlcnic_detach(adapter);



	return err;

}