Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bf517df authored by Himanshu Madhani's avatar Himanshu Madhani Committed by David S. Miller
Browse files

qlcnic: Fix diagnostic test for all adapters. 



o Driver should re-allocate all Tx queues after completing
  diagnostic tests. This regression was added by commit id
  c2c5e3a0 ("qlcnic: Enable
  diagnostic test for multiple Tx queues.")

Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b84caae4

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

+2 −0
Original line number Diff line number Diff line
@@ -948,6 +948,7 @@ static int qlcnic_irq_test(struct net_device *netdev) 
	struct qlcnic_hardware_context *ahw = adapter->ahw;

	struct qlcnic_cmd_args cmd;

	int ret, drv_sds_rings = adapter->drv_sds_rings;

	int drv_tx_rings = adapter->drv_tx_rings;



	if (qlcnic_83xx_check(adapter))

		return qlcnic_83xx_interrupt_test(netdev);
@@ -980,6 +981,7 @@ static int qlcnic_irq_test(struct net_device *netdev) 


clear_diag_irq:

	adapter->drv_sds_rings = drv_sds_rings;

	adapter->drv_tx_rings = drv_tx_rings;

	clear_bit(__QLCNIC_RESETTING, &adapter->state);



	return ret;

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

+0 −1
Original line number Diff line number Diff line
@@ -1940,7 +1940,6 @@ int qlcnic_diag_alloc_res(struct net_device *netdev, int test) 
	qlcnic_detach(adapter);



	adapter->drv_sds_rings = QLCNIC_SINGLE_RING;

	adapter->drv_tx_rings = QLCNIC_SINGLE_RING;

	adapter->ahw->diag_test = test;

	adapter->ahw->linkup = 0;