aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qlcnic/qlcnic.h
diff options
context:
space:
mode:
authorSucheta Chakraborty <sucheta.chakraborty@qlogic.com>2010-04-01 15:01:32 -0400
committerDavid S. Miller <davem@davemloft.net>2010-04-03 17:19:14 -0400
commitaa5e18c04af8706251768e6aba83465e31de7810 (patch)
tree8a766de994e5a9313b5019cca67400375a6a7220 /drivers/net/qlcnic/qlcnic.h
parent0c39aa4819fab75dcce0b1a9d99dcac0d85274f6 (diff)
qlcnic: use IDC defined timeout value
o USE/Read IDC defined timeout value from ROM. o While resetting chip, don't wait for other pci-func to respond, more than reset_ack_timeo seconds, Signed-off-by: Sucheta Chakraborty <sucheta.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.h')
-rw-r--r--drivers/net/qlcnic/qlcnic.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h
index 8a3446df4e90..87cd1a7ef9ca 100644
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/qlcnic/qlcnic.h
@@ -958,8 +958,9 @@ struct qlcnic_adapter {
958 u8 dev_state; 958 u8 dev_state;
959 u8 diag_test; 959 u8 diag_test;
960 u8 diag_cnt; 960 u8 diag_cnt;
961 u8 reset_ack_timeo;
962 u8 dev_init_timeo;
961 u8 rsrd1; 963 u8 rsrd1;
962 u16 rsrd2;
963 964
964 u8 mac_addr[ETH_ALEN]; 965 u8 mac_addr[ETH_ALEN];
965 966
@@ -1040,6 +1041,7 @@ int qlcnic_need_fw_reset(struct qlcnic_adapter *adapter);
1040void qlcnic_request_firmware(struct qlcnic_adapter *adapter); 1041void qlcnic_request_firmware(struct qlcnic_adapter *adapter);
1041void qlcnic_release_firmware(struct qlcnic_adapter *adapter); 1042void qlcnic_release_firmware(struct qlcnic_adapter *adapter);
1042int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter); 1043int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter);
1044void qlcnic_setup_idc_param(struct qlcnic_adapter *adapter);
1043 1045
1044int qlcnic_rom_fast_read(struct qlcnic_adapter *adapter, int addr, int *valp); 1046int qlcnic_rom_fast_read(struct qlcnic_adapter *adapter, int addr, int *valp);
1045int qlcnic_rom_fast_read_words(struct qlcnic_adapter *adapter, int addr, 1047int qlcnic_rom_fast_read_words(struct qlcnic_adapter *adapter, int addr,