diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2007-05-22 00:50:51 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-06-25 14:26:14 -0400 |
commit | 33874a002d4fdd34e35e8265f9b2e0582385f744 (patch) | |
tree | f7e0213d600a80e70b83ff398c5d95bfd4e5e900 | |
parent | 24f02e1d819ad91de46ad3a636cd3f2bf11c720f (diff) |
[SCSI] ibmvscsi: fix timeout bugs
The viosrp_crq timeout field is in seconds.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Santiago Leon <santil@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r-- | drivers/scsi/ibmvscsi/ibmvscsi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index f5da7620ab59..cb73faa7241d 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c | |||
@@ -858,7 +858,7 @@ static void send_mad_adapter_info(struct ibmvscsi_host_data *hostdata) | |||
858 | init_event_struct(evt_struct, | 858 | init_event_struct(evt_struct, |
859 | adapter_info_rsp, | 859 | adapter_info_rsp, |
860 | VIOSRP_MAD_FORMAT, | 860 | VIOSRP_MAD_FORMAT, |
861 | init_timeout * HZ); | 861 | init_timeout); |
862 | 862 | ||
863 | req = &evt_struct->iu.mad.adapter_info; | 863 | req = &evt_struct->iu.mad.adapter_info; |
864 | memset(req, 0x00, sizeof(*req)); | 864 | memset(req, 0x00, sizeof(*req)); |
@@ -953,7 +953,7 @@ static int send_srp_login(struct ibmvscsi_host_data *hostdata) | |||
953 | init_event_struct(evt_struct, | 953 | init_event_struct(evt_struct, |
954 | login_rsp, | 954 | login_rsp, |
955 | VIOSRP_SRP_FORMAT, | 955 | VIOSRP_SRP_FORMAT, |
956 | init_timeout * HZ); | 956 | init_timeout); |
957 | 957 | ||
958 | login = &evt_struct->iu.srp.login_req; | 958 | login = &evt_struct->iu.srp.login_req; |
959 | memset(login, 0x00, sizeof(struct srp_login_req)); | 959 | memset(login, 0x00, sizeof(struct srp_login_req)); |
@@ -1031,7 +1031,7 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd) | |||
1031 | init_event_struct(evt, | 1031 | init_event_struct(evt, |
1032 | sync_completion, | 1032 | sync_completion, |
1033 | VIOSRP_SRP_FORMAT, | 1033 | VIOSRP_SRP_FORMAT, |
1034 | init_timeout * HZ); | 1034 | init_timeout); |
1035 | 1035 | ||
1036 | tsk_mgmt = &evt->iu.srp.tsk_mgmt; | 1036 | tsk_mgmt = &evt->iu.srp.tsk_mgmt; |
1037 | 1037 | ||
@@ -1140,7 +1140,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd) | |||
1140 | init_event_struct(evt, | 1140 | init_event_struct(evt, |
1141 | sync_completion, | 1141 | sync_completion, |
1142 | VIOSRP_SRP_FORMAT, | 1142 | VIOSRP_SRP_FORMAT, |
1143 | init_timeout * HZ); | 1143 | init_timeout); |
1144 | 1144 | ||
1145 | tsk_mgmt = &evt->iu.srp.tsk_mgmt; | 1145 | tsk_mgmt = &evt->iu.srp.tsk_mgmt; |
1146 | 1146 | ||
@@ -1373,7 +1373,7 @@ static int ibmvscsi_do_host_config(struct ibmvscsi_host_data *hostdata, | |||
1373 | init_event_struct(evt_struct, | 1373 | init_event_struct(evt_struct, |
1374 | sync_completion, | 1374 | sync_completion, |
1375 | VIOSRP_MAD_FORMAT, | 1375 | VIOSRP_MAD_FORMAT, |
1376 | init_timeout * HZ); | 1376 | init_timeout); |
1377 | 1377 | ||
1378 | host_config = &evt_struct->iu.mad.host_config; | 1378 | host_config = &evt_struct->iu.mad.host_config; |
1379 | 1379 | ||