aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChristof Schmitt <christof.schmitt@de.ibm.com>2010-07-16 09:37:36 -0400
committerJames Bottomley <James.Bottomley@suse.de>2010-07-28 10:48:48 -0400
commitfaf4cd854203b26527d81e7e13d66e78774dad44 (patch)
tree6828d69341747869ca0de9ed5cf4d3b46ff13efd /drivers
parent1bf3ff02ca6247b2d7c9ebda93002392bf60a61d (diff)
[SCSI] zfcp: Use correct width for timer_interval field
The timer_interval is 14 bits in width. Introduce a define for properly masking the value. Reviewed-by: Swen Schillig <swen@vnet.ibm.com> Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/s390/scsi/zfcp_fsf.c2
-rw-r--r--drivers/s390/scsi/zfcp_fsf.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 71663fb77310..ee0c1df8a6d2 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -495,7 +495,7 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)
495 fc_host_supported_classes(shost) = FC_COS_CLASS2 | FC_COS_CLASS3; 495 fc_host_supported_classes(shost) = FC_COS_CLASS2 | FC_COS_CLASS3;
496 496
497 adapter->hydra_version = bottom->adapter_type; 497 adapter->hydra_version = bottom->adapter_type;
498 adapter->timer_ticks = bottom->timer_interval; 498 adapter->timer_ticks = bottom->timer_interval & ZFCP_FSF_TIMER_INT_MASK;
499 adapter->stat_read_buf_num = max(bottom->status_read_buf_num, 499 adapter->stat_read_buf_num = max(bottom->status_read_buf_num,
500 (u16)FSF_STATUS_READS_RECOM); 500 (u16)FSF_STATUS_READS_RECOM);
501 501
diff --git a/drivers/s390/scsi/zfcp_fsf.h b/drivers/s390/scsi/zfcp_fsf.h
index 519083fd6e89..ca45e32d6b6f 100644
--- a/drivers/s390/scsi/zfcp_fsf.h
+++ b/drivers/s390/scsi/zfcp_fsf.h
@@ -352,6 +352,8 @@ struct fsf_qtcb_bottom_support {
352 u8 els[256]; 352 u8 els[256];
353} __attribute__ ((packed)); 353} __attribute__ ((packed));
354 354
355#define ZFCP_FSF_TIMER_INT_MASK 0x3FFF
356
355struct fsf_qtcb_bottom_config { 357struct fsf_qtcb_bottom_config {
356 u32 lic_version; 358 u32 lic_version;
357 u32 feature_selection; 359 u32 feature_selection;