diff options
author | James Smart <James.Smart@Emulex.Com> | 2007-03-12 15:16:35 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-03-20 11:52:04 -0400 |
commit | c3d2350a8420dbf9d48f5f8a0fb72117bfcbc1b0 (patch) | |
tree | 858b3df001af2d3f04020340f89e9190dde79283 | |
parent | 457620b47a5398e779584fc3c470683fbb3d1c8d (diff) |
[SCSI] fc_transport: update potential link speeds
This patch updates the FC transport for all speeds identified in
SM-HBA. Note: it does not sync the "bit" definitions, as that is
actually insulated from user-space via the sysfs text string. (I could
do it, but it does introduce a potential binary-incompatibility).
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r-- | drivers/scsi/scsi_transport_fc.c | 2 | ||||
-rw-r--r-- | include/scsi/scsi_transport_fc.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index 58afdb401703..14c4f065b2b8 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c | |||
@@ -200,6 +200,8 @@ static const struct { | |||
200 | { FC_PORTSPEED_2GBIT, "2 Gbit" }, | 200 | { FC_PORTSPEED_2GBIT, "2 Gbit" }, |
201 | { FC_PORTSPEED_4GBIT, "4 Gbit" }, | 201 | { FC_PORTSPEED_4GBIT, "4 Gbit" }, |
202 | { FC_PORTSPEED_10GBIT, "10 Gbit" }, | 202 | { FC_PORTSPEED_10GBIT, "10 Gbit" }, |
203 | { FC_PORTSPEED_8GBIT, "8 Gbit" }, | ||
204 | { FC_PORTSPEED_16GBIT, "16 Gbit" }, | ||
203 | { FC_PORTSPEED_NOT_NEGOTIATED, "Not Negotiated" }, | 205 | { FC_PORTSPEED_NOT_NEGOTIATED, "Not Negotiated" }, |
204 | }; | 206 | }; |
205 | fc_bitfield_name_search(port_speed, fc_port_speed_names) | 207 | fc_bitfield_name_search(port_speed, fc_port_speed_names) |
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h index 798f7c7ee426..1e797308640a 100644 --- a/include/scsi/scsi_transport_fc.h +++ b/include/scsi/scsi_transport_fc.h | |||
@@ -108,6 +108,8 @@ enum fc_port_state { | |||
108 | #define FC_PORTSPEED_2GBIT 2 | 108 | #define FC_PORTSPEED_2GBIT 2 |
109 | #define FC_PORTSPEED_4GBIT 4 | 109 | #define FC_PORTSPEED_4GBIT 4 |
110 | #define FC_PORTSPEED_10GBIT 8 | 110 | #define FC_PORTSPEED_10GBIT 8 |
111 | #define FC_PORTSPEED_8GBIT 0x10 | ||
112 | #define FC_PORTSPEED_16GBIT 0x20 | ||
111 | #define FC_PORTSPEED_NOT_NEGOTIATED (1 << 15) /* Speed not established */ | 113 | #define FC_PORTSPEED_NOT_NEGOTIATED (1 << 15) /* Speed not established */ |
112 | 114 | ||
113 | /* | 115 | /* |