diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-27 09:54:08 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-27 09:54:08 -0800 |
commit | be8cde8b24c9dca1e54598690115eee5b1476519 (patch) | |
tree | 5142cedbf08050eb2af074f00979cf89d90b744f /include | |
parent | 981a2edd1922c00e747680f30734ea50c86af28d (diff) | |
parent | 534ef056db8a8fb6b9d50188d88ed5d1fbc66673 (diff) | |
download | linux-be8cde8b24c9dca1e54598690115eee5b1476519.tar.gz linux-be8cde8b24c9dca1e54598690115eee5b1476519.tar.bz2 linux-be8cde8b24c9dca1e54598690115eee5b1476519.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] aic79xx: check for non-NULL scb in ahd_handle_nonpkt_busfree
[SCSI] zfcp: Set hardware timeout as requested by BSG request.
[SCSI] zfcp: Introduce bsg_timeout callback.
[SCSI] scsi_transport_fc: Allow LLD to reset FC BSG timeout
[SCSI] zfcp: add missing compat ptr conversion
[SCSI] zfcp: Fix linebreak in hba trace
[SCSI] zfcp: Issue zfcp_fc_wka_port_put after FC CT BSG request
[SCSI] qla2xxx: Update version number to 8.03.01-k10.
[SCSI] fc-transport: Use packed modifier for fc_bsg_request structure.
[SCSI] qla2xxx: Perform fast mailbox read of flash regardless of size nor address alignment.
[SCSI] qla2xxx: Correct FCP2 recovery handling.
[SCSI] scsi_lib: Fix bug in completion of bidi commands
[SCSI] mptsas: Fix issue with chain pools allocation on katmai
[SCSI] aacraid: fix File System going into read-only mode
[SCSI] lpfc: fix file permissions
Diffstat (limited to 'include')
-rw-r--r-- | include/scsi/scsi_bsg_fc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/scsi_bsg_fc.h b/include/scsi/scsi_bsg_fc.h index a4b233318179..91a4e4ff9a9b 100644 --- a/include/scsi/scsi_bsg_fc.h +++ b/include/scsi/scsi_bsg_fc.h @@ -292,7 +292,7 @@ struct fc_bsg_request { struct fc_bsg_rport_els r_els; struct fc_bsg_rport_ct r_ct; } rqst_data; -}; +} __attribute__((packed)); /* response (request sense data) structure of the sg_io_v4 */ |