diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 20:53:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 20:53:36 -0400 |
| commit | 39695224bd84dc4be29abad93a0ec232a16fc519 (patch) | |
| tree | 2bfa5cb50788a4c8be9f2e9f4412e47a565f4508 /include/scsi/fc_frame.h | |
| parent | a9bbd210a44102cc50b30a5f3d111dbf5f2f9cd4 (diff) | |
| parent | ea038f63ac52439e7816295fa6064fe95e6c1f51 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (209 commits)
[SCSI] fix oops during scsi scanning
[SCSI] libsrp: fix memory leak in srp_ring_free()
[SCSI] libiscsi, bnx2i: make bound ep check common
[SCSI] libiscsi: add completion function for drivers that do not need pdu processing
[SCSI] scsi_dh_rdac: changes for rdac debug logging
[SCSI] scsi_dh_rdac: changes to collect the rdac debug information during the initialization
[SCSI] scsi_dh_rdac: move the init code from rdac_activate to rdac_bus_attach
[SCSI] sg: fix oops in the error path in sg_build_indirect()
[SCSI] mptsas : Bump version to 3.04.12
[SCSI] mptsas : FW event thread and scsi mid layer deadlock in SYNCHRONIZE CACHE command
[SCSI] mptsas : Send DID_NO_CONNECT for pending IOs of removed device
[SCSI] mptsas : PAE Kernel more than 4 GB kernel panic
[SCSI] mptsas : NULL pointer on big endian systems causing Expander not to tear off
[SCSI] mptsas : Sanity check for phyinfo is added
[SCSI] scsi_dh_rdac: Add support for Sun StorageTek ST2500, ST2510 and ST2530
[SCSI] pmcraid: PMC-Sierra MaxRAID driver to support 6Gb/s SAS RAID controller
[SCSI] qla2xxx: Update version number to 8.03.01-k6.
[SCSI] qla2xxx: Properly delete rports attached to a vport.
[SCSI] qla2xxx: Correct various NPIV issues.
[SCSI] qla2xxx: Correct qla2x00_eh_wait_on_command() to wait correctly.
...
Diffstat (limited to 'include/scsi/fc_frame.h')
| -rw-r--r-- | include/scsi/fc_frame.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/scsi/fc_frame.h b/include/scsi/fc_frame.h index 59511057cee0..c35d2383cc26 100644 --- a/include/scsi/fc_frame.h +++ b/include/scsi/fc_frame.h | |||
| @@ -37,13 +37,6 @@ | |||
| 37 | #define FC_FRAME_HEADROOM 32 /* headroom for VLAN + FCoE headers */ | 37 | #define FC_FRAME_HEADROOM 32 /* headroom for VLAN + FCoE headers */ |
| 38 | #define FC_FRAME_TAILROOM 8 /* trailer space for FCoE */ | 38 | #define FC_FRAME_TAILROOM 8 /* trailer space for FCoE */ |
| 39 | 39 | ||
| 40 | /* | ||
| 41 | * Information about an individual fibre channel frame received or to be sent. | ||
| 42 | * The buffer may be in up to 4 additional non-contiguous sections, | ||
| 43 | * but the linear section must hold the frame header. | ||
| 44 | */ | ||
| 45 | #define FC_FRAME_SG_LEN 4 /* scatter/gather list maximum length */ | ||
| 46 | |||
| 47 | #define fp_skb(fp) (&((fp)->skb)) | 40 | #define fp_skb(fp) (&((fp)->skb)) |
| 48 | #define fr_hdr(fp) ((fp)->skb.data) | 41 | #define fr_hdr(fp) ((fp)->skb.data) |
| 49 | #define fr_len(fp) ((fp)->skb.len) | 42 | #define fr_len(fp) ((fp)->skb.len) |