diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 18:53:40 +0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 18:53:40 +0400 |
| commit | 832e77bc1106592c621fc42f2f6a4500e414a0a1 (patch) | |
| tree | 2b226019e7b1344f05e44d79da956a5306d20780 /include/scsi/sas.h | |
| parent | e0fd9affeb64088eff407dfc98bbd3a5c17ea479 (diff) | |
| parent | e689cf0caf2d5ebcb300fb69887d35c0abdbdb97 (diff) | |
| download | linux-832e77bc1106592c621fc42f2f6a4500e414a0a1.tar.xz | |
Merge branch 'misc' into for-linus
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'include/scsi/sas.h')
| -rw-r--r-- | include/scsi/sas.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/include/scsi/sas.h b/include/scsi/sas.h index be3eb0bf1ac0..0d2607d12387 100644 --- a/include/scsi/sas.h +++ b/include/scsi/sas.h @@ -90,16 +90,18 @@ enum sas_oob_mode { }; /* See sas_discover.c if you plan on changing these */ -enum sas_dev_type { - NO_DEVICE = 0, /* protocol */ - SAS_END_DEV = 1, /* protocol */ - EDGE_DEV = 2, /* protocol */ - FANOUT_DEV = 3, /* protocol */ - SAS_HA = 4, - SATA_DEV = 5, - SATA_PM = 7, - SATA_PM_PORT= 8, - SATA_PENDING = 9, +enum sas_device_type { + /* these are SAS protocol defined (attached device type field) */ + SAS_PHY_UNUSED = 0, + SAS_END_DEVICE = 1, + SAS_EDGE_EXPANDER_DEVICE = 2, + SAS_FANOUT_EXPANDER_DEVICE = 3, + /* these are internal to libsas */ + SAS_HA = 4, + SAS_SATA_DEV = 5, + SAS_SATA_PM = 7, + SAS_SATA_PM_PORT = 8, + SAS_SATA_PENDING = 9, }; enum sas_protocol { |