diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-17 10:46:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-17 10:46:18 +0100 |
| commit | 9dacc71ff31a008d1e689fc824d31f6696454f68 (patch) | |
| tree | b792f9c30008e1ed469a73ead4339fdf8a50a5ce /drivers/s390/scsi/zfcp_dbf.h | |
| parent | 19f47c634ea8c5a10ff7bb1a08c52fd0f49bc54c (diff) | |
| parent | 9bf1a2445f3c569098b8de7097ca324e65abecc2 (diff) | |
Merge commit 'v2.6.28-rc5' into x86/cleanups
Diffstat (limited to 'drivers/s390/scsi/zfcp_dbf.h')
| -rw-r--r-- | drivers/s390/scsi/zfcp_dbf.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/s390/scsi/zfcp_dbf.h b/drivers/s390/scsi/zfcp_dbf.h index e8f450801fe..5d6b2dff855 100644 --- a/drivers/s390/scsi/zfcp_dbf.h +++ b/drivers/s390/scsi/zfcp_dbf.h @@ -163,8 +163,6 @@ struct zfcp_san_dbf_record_ct_request { u8 options; u16 max_res_size; u32 len; -#define ZFCP_DBF_CT_PAYLOAD 24 - u8 payload[ZFCP_DBF_CT_PAYLOAD]; } __attribute__ ((packed)); struct zfcp_san_dbf_record_ct_response { @@ -174,15 +172,11 @@ struct zfcp_san_dbf_record_ct_response { u8 expl; u8 vendor_unique; u32 len; - u8 payload[ZFCP_DBF_CT_PAYLOAD]; } __attribute__ ((packed)); struct zfcp_san_dbf_record_els { u8 ls_code; u32 len; -#define ZFCP_DBF_ELS_PAYLOAD 32 -#define ZFCP_DBF_ELS_MAX_PAYLOAD 1024 - u8 payload[ZFCP_DBF_ELS_PAYLOAD]; } __attribute__ ((packed)); struct zfcp_san_dbf_record { @@ -196,6 +190,8 @@ struct zfcp_san_dbf_record { struct zfcp_san_dbf_record_ct_response ct_resp; struct zfcp_san_dbf_record_els els; } u; +#define ZFCP_DBF_SAN_MAX_PAYLOAD 1024 + u8 payload[32]; } __attribute__ ((packed)); struct zfcp_scsi_dbf_record { |