aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qlcnic/qlcnic_main.c
diff options
context:
space:
mode:
authorAmit Kumar Salecha <amit.salecha@qlogic.com>2010-04-21 22:51:36 -0400
committerDavid S. Miller <davem@davemloft.net>2010-04-22 18:28:27 -0400
commitbbd8c6a45b0f8557a8fc38fc763d7a51fac4459d (patch)
tree38e1f4dfc627f8e6e76129e865ec8b4bafc2509f /drivers/net/qlcnic/qlcnic_main.c
parent8ae6df978b986a5ce099e7e7118f127563d2cbbe (diff)
qlcnic: fix defines as per IDC document
Different class of drivers co-exist for CNA device, there is some minimal interaction that will be required amongst the drivers for performing some device level operations. All the driver should follow inter driver coexistence document. Fixing polling interval and spelling mistake. Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com> Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic/qlcnic_main.c')
-rw-r--r--drivers/net/qlcnic/qlcnic_main.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 5845dc0616b1..ff7705b26450 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -2054,7 +2054,7 @@ qlcnic_can_start_firmware(struct qlcnic_adapter *adapter)
2054 switch (prev_state) { 2054 switch (prev_state) {
2055 case QLCNIC_DEV_COLD: 2055 case QLCNIC_DEV_COLD:
2056start_fw: 2056start_fw:
2057 QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_INITALIZING); 2057 QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_INITIALIZING);
2058 qlcnic_api_unlock(adapter); 2058 qlcnic_api_unlock(adapter);
2059 return 1; 2059 return 1;
2060 2060
@@ -2077,6 +2077,10 @@ start_fw:
2077 case QLCNIC_DEV_FAILED: 2077 case QLCNIC_DEV_FAILED:
2078 qlcnic_api_unlock(adapter); 2078 qlcnic_api_unlock(adapter);
2079 return -1; 2079 return -1;
2080
2081 case QLCNIC_DEV_INITIALIZING:
2082 case QLCNIC_DEV_QUISCENT:
2083 break;
2080 } 2084 }
2081 2085
2082 qlcnic_api_unlock(adapter); 2086 qlcnic_api_unlock(adapter);
@@ -2208,7 +2212,8 @@ qlcnic_dev_request_reset(struct qlcnic_adapter *adapter)
2208 2212
2209 state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE); 2213 state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);
2210 2214
2211 if (state != QLCNIC_DEV_INITALIZING && state != QLCNIC_DEV_NEED_RESET) { 2215 if (state != QLCNIC_DEV_INITIALIZING &&
2216 state != QLCNIC_DEV_NEED_RESET) {
2212 QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_NEED_RESET); 2217 QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_NEED_RESET);
2213 set_bit(__QLCNIC_START_FW, &adapter->state); 2218 set_bit(__QLCNIC_START_FW, &adapter->state);
2214 QLCDB(adapter, DRV, "NEED_RESET state set\n"); 2219 QLCDB(adapter, DRV, "NEED_RESET state set\n");