diff options
Diffstat (limited to 'drivers/s390/scsi/zfcp_def.h')
-rw-r--r-- | drivers/s390/scsi/zfcp_def.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index 9bb511083a26..6eba56cd89ba 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h | |||
@@ -34,8 +34,6 @@ | |||
34 | #ifndef ZFCP_DEF_H | 34 | #ifndef ZFCP_DEF_H |
35 | #define ZFCP_DEF_H | 35 | #define ZFCP_DEF_H |
36 | 36 | ||
37 | #define ZFCP_DEF_REVISION "$Revision: 1.111 $" | ||
38 | |||
39 | /*************************** INCLUDES *****************************************/ | 37 | /*************************** INCLUDES *****************************************/ |
40 | 38 | ||
41 | #include <linux/init.h> | 39 | #include <linux/init.h> |
@@ -154,11 +152,6 @@ typedef u32 scsi_lun_t; | |||
154 | #define ZFCP_EXCHANGE_CONFIG_DATA_FIRST_SLEEP 100 | 152 | #define ZFCP_EXCHANGE_CONFIG_DATA_FIRST_SLEEP 100 |
155 | #define ZFCP_EXCHANGE_CONFIG_DATA_RETRIES 7 | 153 | #define ZFCP_EXCHANGE_CONFIG_DATA_RETRIES 7 |
156 | 154 | ||
157 | /* Retry 5 times every 2 second, then every minute */ | ||
158 | #define ZFCP_EXCHANGE_PORT_DATA_SHORT_RETRIES 5 | ||
159 | #define ZFCP_EXCHANGE_PORT_DATA_SHORT_SLEEP 200 | ||
160 | #define ZFCP_EXCHANGE_PORT_DATA_LONG_SLEEP 6000 | ||
161 | |||
162 | /* timeout value for "default timer" for fsf requests */ | 155 | /* timeout value for "default timer" for fsf requests */ |
163 | #define ZFCP_FSF_REQUEST_TIMEOUT (60*HZ); | 156 | #define ZFCP_FSF_REQUEST_TIMEOUT (60*HZ); |
164 | 157 | ||
@@ -431,11 +424,7 @@ struct zfcp_scsi_dbf_record { | |||
431 | u32 fsf_seqno; | 424 | u32 fsf_seqno; |
432 | u64 fsf_issued; | 425 | u64 fsf_issued; |
433 | union { | 426 | union { |
434 | struct { | 427 | u64 old_fsf_reqid; |
435 | u64 fsf_reqid; | ||
436 | u32 fsf_seqno; | ||
437 | u64 fsf_issued; | ||
438 | } new_fsf_req; | ||
439 | struct { | 428 | struct { |
440 | u8 rsp_validity; | 429 | u8 rsp_validity; |
441 | u8 rsp_scsi_status; | 430 | u8 rsp_scsi_status; |
@@ -675,6 +664,7 @@ do { \ | |||
675 | #define ZFCP_STATUS_UNIT_TEMPORARY 0x00000002 | 664 | #define ZFCP_STATUS_UNIT_TEMPORARY 0x00000002 |
676 | #define ZFCP_STATUS_UNIT_SHARED 0x00000004 | 665 | #define ZFCP_STATUS_UNIT_SHARED 0x00000004 |
677 | #define ZFCP_STATUS_UNIT_READONLY 0x00000008 | 666 | #define ZFCP_STATUS_UNIT_READONLY 0x00000008 |
667 | #define ZFCP_STATUS_UNIT_REGISTERED 0x00000010 | ||
678 | 668 | ||
679 | /* FSF request status (this does not have a common part) */ | 669 | /* FSF request status (this does not have a common part) */ |
680 | #define ZFCP_STATUS_FSFREQ_NOT_INIT 0x00000000 | 670 | #define ZFCP_STATUS_FSFREQ_NOT_INIT 0x00000000 |
@@ -917,8 +907,6 @@ struct zfcp_adapter { | |||
917 | wwn_t peer_wwnn; /* P2P peer WWNN */ | 907 | wwn_t peer_wwnn; /* P2P peer WWNN */ |
918 | wwn_t peer_wwpn; /* P2P peer WWPN */ | 908 | wwn_t peer_wwpn; /* P2P peer WWPN */ |
919 | u32 peer_d_id; /* P2P peer D_ID */ | 909 | u32 peer_d_id; /* P2P peer D_ID */ |
920 | wwn_t physical_wwpn; /* WWPN of physical port */ | ||
921 | u32 physical_s_id; /* local FC port ID */ | ||
922 | struct ccw_device *ccw_device; /* S/390 ccw device */ | 910 | struct ccw_device *ccw_device; /* S/390 ccw device */ |
923 | u8 fc_service_class; | 911 | u8 fc_service_class; |
924 | u32 hydra_version; /* Hydra version */ | 912 | u32 hydra_version; /* Hydra version */ |