diff options
| author | James Bottomley <jejb@titanic> | 2005-04-18 13:45:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic> | 2005-04-18 13:45:00 -0500 |
| commit | c46f2ffb9e7fce7208c2639790e1ade42e00b146 (patch) | |
| tree | 284912295d46a861930d0619788a650f56c2a29b /drivers/s390/scsi/zfcp_def.h | |
| parent | c2a9331c62216e222a08de8dd58559367fef0af6 (diff) | |
| parent | f59114b7b5dc677bbd7cc7e26a5fcb3572a3445c (diff) | |
merge by hand (scsi_device.h)
Diffstat (limited to 'drivers/s390/scsi/zfcp_def.h')
| -rw-r--r-- | drivers/s390/scsi/zfcp_def.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index 53fcccbb424..0afa1c4696c 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h @@ -70,7 +70,7 @@ /********************* GENERAL DEFINES *********************************/ /* zfcp version number, it consists of major, minor, and patch-level number */ -#define ZFCP_VERSION "4.2.0" +#define ZFCP_VERSION "4.3.0" /** * zfcp_sg_to_address - determine kernel address from struct scatterlist @@ -851,6 +851,9 @@ struct zfcp_adapter { wwn_t wwnn; /* WWNN */ wwn_t wwpn; /* WWPN */ fc_id_t s_id; /* N_Port ID */ + wwn_t peer_wwnn; /* P2P peer WWNN */ + wwn_t peer_wwpn; /* P2P peer WWPN */ + fc_id_t peer_d_id; /* P2P peer D_ID */ struct ccw_device *ccw_device; /* S/390 ccw device */ u8 fc_service_class; u32 fc_topology; /* FC topology */ |