diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 20:19:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 20:19:08 -0500 |
| commit | 9b73e76f3cf63379dcf45fcd4f112f5812418d0a (patch) | |
| tree | 4e6bef87cd0cd6d848fc39a5ae25b981dbbe035b /include/scsi/sas.h | |
| parent | 50d9a126240f9961cfdd063336bbeb91f77a7dce (diff) | |
| parent | 23c3e290fb9ce38cabc2822b47583fc8702411bf (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: (200 commits)
[SCSI] usbstorage: use last_sector_bug flag universally
[SCSI] libsas: abstract STP task status into a function
[SCSI] ultrastor: clean up inline asm warnings
[SCSI] aic7xxx: fix firmware build
[SCSI] aacraid: fib context lock for management ioctls
[SCSI] ch: remove forward declarations
[SCSI] ch: fix device minor number management bug
[SCSI] ch: handle class_device_create failure properly
[SCSI] NCR5380: fix section mismatch
[SCSI] sg: fix /proc/scsi/sg/devices when no SCSI devices
[SCSI] IB/iSER: add logical unit reset support
[SCSI] don't use __GFP_DMA for sense buffers if not required
[SCSI] use dynamically allocated sense buffer
[SCSI] scsi.h: add macro for enclosure bit of inquiry data
[SCSI] sd: add fix for devices with last sector access problems
[SCSI] fix pcmcia compile problem
[SCSI] aacraid: add Voodoo Lite class of cards.
[SCSI] aacraid: add new driver features flags
[SCSI] qla2xxx: Update version number to 8.02.00-k7.
[SCSI] qla2xxx: Issue correct MBC_INITIALIZE_FIRMWARE command.
...
Diffstat (limited to 'include/scsi/sas.h')
| -rw-r--r-- | include/scsi/sas.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/scsi/sas.h b/include/scsi/sas.h index 2f4b6afa34fc..e9fd02281381 100644 --- a/include/scsi/sas.h +++ b/include/scsi/sas.h | |||
| @@ -102,13 +102,12 @@ enum sas_dev_type { | |||
| 102 | SATA_PM_PORT= 8, | 102 | SATA_PM_PORT= 8, |
| 103 | }; | 103 | }; |
| 104 | 104 | ||
| 105 | /* Partly from IDENTIFY address frame. */ | 105 | enum sas_protocol { |
| 106 | enum sas_proto { | 106 | SAS_PROTOCOL_SATA = 0x01, |
| 107 | SATA_PROTO = 1, | 107 | SAS_PROTOCOL_SMP = 0x02, |
| 108 | SAS_PROTO_SMP = 2, /* protocol */ | 108 | SAS_PROTOCOL_STP = 0x04, |
| 109 | SAS_PROTO_STP = 4, /* protocol */ | 109 | SAS_PROTOCOL_SSP = 0x08, |
| 110 | SAS_PROTO_SSP = 8, /* protocol */ | 110 | SAS_PROTOCOL_ALL = 0x0E, |
| 111 | SAS_PROTO_ALL = 0xE, | ||
| 112 | }; | 111 | }; |
| 113 | 112 | ||
| 114 | /* From the spec; local phys only */ | 113 | /* From the spec; local phys only */ |