diff options
author | James Smart <james.smart@emulex.com> | 2015-04-02 15:50:52 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Odin.com> | 2015-04-10 10:40:32 -0400 |
commit | c749e6bca57ffcc161c1ede8d9dcf274044eca15 (patch) | |
tree | d8b6e39748e7714935101c6fbe04499428d0efd4 | |
parent | eef77801b56b098cd7e1daf8a03854dd203a051c (diff) |
scsi_transport_fc: Add support for 25Gbit speed
Signed-off-by: James Smart <james.smart@emulex.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
-rw-r--r-- | drivers/scsi/scsi_transport_fc.c | 1 | ||||
-rw-r--r-- | include/scsi/scsi_transport_fc.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index 5d6f348eb3d8..24eaaf66af71 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c | |||
@@ -265,6 +265,7 @@ static const struct { | |||
265 | { FC_PORTSPEED_40GBIT, "40 Gbit" }, | 265 | { FC_PORTSPEED_40GBIT, "40 Gbit" }, |
266 | { FC_PORTSPEED_50GBIT, "50 Gbit" }, | 266 | { FC_PORTSPEED_50GBIT, "50 Gbit" }, |
267 | { FC_PORTSPEED_100GBIT, "100 Gbit" }, | 267 | { FC_PORTSPEED_100GBIT, "100 Gbit" }, |
268 | { FC_PORTSPEED_25GBIT, "25 Gbit" }, | ||
268 | { FC_PORTSPEED_NOT_NEGOTIATED, "Not Negotiated" }, | 269 | { FC_PORTSPEED_NOT_NEGOTIATED, "Not Negotiated" }, |
269 | }; | 270 | }; |
270 | fc_bitfield_name_search(port_speed, fc_port_speed_names) | 271 | 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 007a0bc01b74..784bc2c0929f 100644 --- a/include/scsi/scsi_transport_fc.h +++ b/include/scsi/scsi_transport_fc.h | |||
@@ -135,6 +135,7 @@ enum fc_vport_state { | |||
135 | #define FC_PORTSPEED_40GBIT 0x100 | 135 | #define FC_PORTSPEED_40GBIT 0x100 |
136 | #define FC_PORTSPEED_50GBIT 0x200 | 136 | #define FC_PORTSPEED_50GBIT 0x200 |
137 | #define FC_PORTSPEED_100GBIT 0x400 | 137 | #define FC_PORTSPEED_100GBIT 0x400 |
138 | #define FC_PORTSPEED_25GBIT 0x800 | ||
138 | #define FC_PORTSPEED_NOT_NEGOTIATED (1 << 15) /* Speed not established */ | 139 | #define FC_PORTSPEED_NOT_NEGOTIATED (1 << 15) /* Speed not established */ |
139 | 140 | ||
140 | /* | 141 | /* |