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

Commit 16e3cf73 authored by Sritej Velaga's avatar Sritej Velaga Committed by David S. Miller
Browse files

qlcnic: skip IDC ack check in fw reset path. 



In fw reset path, we should consider any change in device state as an
ack from the other driver. When that happens, we don't have to wait for
an explicit ack.

Signed-off-by: default avatarSritej Velaga <sritej.velaga@qlogic.com>
Signed-off-by: default avatarAnirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9eeebb5b

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

+8 −1
Original line number Diff line number Diff line
@@ -2840,8 +2840,15 @@ qlcnic_fwinit_work(struct work_struct *work) 
		goto wait_npar;

	}



	if (dev_state == QLCNIC_DEV_INITIALIZING ||

	    dev_state == QLCNIC_DEV_READY) {

		dev_info(&adapter->pdev->dev, "Detected state change from "

				"DEV_NEED_RESET, skipping ack check\n");

		goto skip_ack_check;

	}



	if (adapter->fw_wait_cnt++ > adapter->reset_ack_timeo) {

		dev_err(&adapter->pdev->dev, "Reset:Failed to get ack %d sec\n",

		dev_info(&adapter->pdev->dev, "Reset:Failed to get ack %d sec\n",

					adapter->reset_ack_timeo);

		goto skip_ack_check;

	}