diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
| commit | c324b44c34050cf2a9b58830e11c974806bd85d8 (patch) | |
| tree | 3ac45a783221283925cd698334a8f5e7dd4c1df8 /drivers/scsi/lpfc/lpfc_scsi.h | |
| parent | 2fcf522509cceea524b6e7ece8fd6759b682175a (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_scsi.h')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h index 0fd9ba14e1b5..acd64c49e849 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.h +++ b/drivers/scsi/lpfc/lpfc_scsi.h | |||
| @@ -78,18 +78,7 @@ struct fcp_rsp { | |||
| 78 | }; | 78 | }; |
| 79 | 79 | ||
| 80 | struct fcp_cmnd { | 80 | struct fcp_cmnd { |
| 81 | uint32_t fcpLunMsl; /* most significant lun word (32 bits) */ | 81 | struct scsi_lun fcp_lun; |
| 82 | uint32_t fcpLunLsl; /* least significant lun word (32 bits) */ | ||
| 83 | /* # of bits to shift lun id to end up in right | ||
| 84 | * payload word, little endian = 8, big = 16. | ||
| 85 | */ | ||
| 86 | #ifdef __BIG_ENDIAN | ||
| 87 | #define FC_LUN_SHIFT 16 | ||
| 88 | #define FC_ADDR_MODE_SHIFT 24 | ||
| 89 | #else /* __LITTLE_ENDIAN */ | ||
| 90 | #define FC_LUN_SHIFT 8 | ||
| 91 | #define FC_ADDR_MODE_SHIFT 0 | ||
| 92 | #endif | ||
| 93 | 82 | ||
| 94 | uint8_t fcpCntl0; /* FCP_CNTL byte 0 (reserved) */ | 83 | uint8_t fcpCntl0; /* FCP_CNTL byte 0 (reserved) */ |
| 95 | uint8_t fcpCntl1; /* FCP_CNTL byte 1 task codes */ | 84 | uint8_t fcpCntl1; /* FCP_CNTL byte 1 task codes */ |