diff options
author | Sony Chacko <sony.chacko@qlogic.com> | 2010-08-31 19:17:44 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-01 19:41:53 +0200 |
commit | 4e70812b3dc32c76fa2fa3aa2c8221eaac87cd6f (patch) | |
tree | 3fcbb778ec0d67bebcf27c3215625e6f6021ed05 /drivers/net/qlcnic/qlcnic_hdr.h | |
parent | stmmac: Fix another build warning. (diff) | |
download | linux-4e70812b3dc32c76fa2fa3aa2c8221eaac87cd6f.tar.xz linux-4e70812b3dc32c76fa2fa3aa2c8221eaac87cd6f.zip |
qlcnic: backout firmware initialization update
o Backing out "firmware initialization update" changes, commit-id
"d4066833bb1b35fefb1dd45eb2b10659d46bf151".
o fix heartbit spelling, it should be heartbeat
Signed-off-by: Sony Chacko <sony.chacko@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_hdr.h')
-rw-r--r-- | drivers/net/qlcnic/qlcnic_hdr.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/qlcnic/qlcnic_hdr.h b/drivers/net/qlcnic/qlcnic_hdr.h index bce1b1d541b7..716203e41dc7 100644 --- a/drivers/net/qlcnic/qlcnic_hdr.h +++ b/drivers/net/qlcnic/qlcnic_hdr.h @@ -747,8 +747,12 @@ enum { #define QLCNIC_RESET_TIMEOUT_SECS 10 #define QLCNIC_INIT_TIMEOUT_SECS 30 +#define QLCNIC_RCVPEG_CHECK_RETRY_COUNT 2000 +#define QLCNIC_RCVPEG_CHECK_DELAY 10 +#define QLCNIC_CMDPEG_CHECK_RETRY_COUNT 60 +#define QLCNIC_CMDPEG_CHECK_DELAY 500 #define QLCNIC_HEARTBEAT_PERIOD_MSECS 200 -#define QLCNIC_HEARTBEAT_RETRY_COUNT 45 +#define QLCNIC_HEARTBEAT_CHECK_RETRY_COUNT 45 #define ISR_MSI_INT_TRIGGER(FUNC) (QLCNIC_PCIX_PS_REG(PCIX_MSI_F(FUNC))) #define ISR_LEGACY_INT_TRIGGERED(VAL) (((VAL) & 0x300) == 0x200) |