netxen: fix corner cases of firmware recovery (6b50ea15) · Commits · 戴 / test

Signed-off-by:

Amit Kumar Salecha <amit.salecha@qlogic.com> o DEV_NEED_RESET state was not handled during fw intialization phase. o nx_decr_dev_ref_cnt() can return error, if fail to grab pcie seamphore. Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/netxen/netxen_nic_main.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -2294,6 +2294,7 @@ netxen_fwinit_work(struct work_struct *work)
		}
		break;

		case NX_DEV_NEED_RESET:
		case NX_DEV_INITALIZING:
		if (++adapter->fw_wait_cnt < FW_POLL_THRESH) {
		netxen_schedule_work(adapter,
		@@ -2337,6 +2338,9 @@ netxen_detach_work(struct work_struct *work)

		ref_cnt = nx_decr_dev_ref_cnt(adapter);

		if (ref_cnt == -EIO)
		goto err_ret;

		delay = (ref_cnt == 0) ? 0 : (2 * FW_POLL_DELAY);

		adapter->fw_wait_cnt = 0;

Admin message