From 92255c8704cf7905705ce1134ed319cc1db95d65 Mon Sep 17 00:00:00 2001 From: Sritej Velaga Date: Fri, 28 Oct 2011 12:57:11 +0000 Subject: [PATCH] --- yaml --- r: 271625 b: refs/heads/master c: 16e3cf73befecd882399d6ec7b12e8fb2c7abf73 h: refs/heads/master i: 271623: 19eb2c3b12bfb6dd813aa6b3816e2fcfa011d743 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e8a5e830ffa4..eea04dac4831 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9eeebb5bc8d984298cba9d12690923cdc09ab173 +refs/heads/master: 16e3cf73befecd882399d6ec7b12e8fb2c7abf73 diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 106503f118f6..2edffcec930f 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -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; }