aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDick Kennedy <Dick.Kennedy@Emulex.Com>2014-06-13 12:40:36 -0400
committerChristoph Hellwig <hch@lst.de>2014-07-25 17:16:54 -0400
commitc21a2c1a4973c8dde32557970fdb44eaa9489aeb (patch)
treef1ffa6d97e38893328740b898f1189fd2087a2dd
parent915aafd856d1a4ef1dea30c2b20ada03c93be4d7 (diff)
scsi: add defines for new FC port speeds.
These speeds are to support the next generation of FCoE port speeds. Signed-off-by: Dick Kennedy <Dick.Kennedy@Emulex.Com> Reviewed-by: Ewan D. Milne <emilne@redhat.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
-rw-r--r--drivers/scsi/scsi_transport_fc.c4
-rw-r--r--include/scsi/scsi_transport_fc.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 4b0f167e8c21..5d6f348eb3d8 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -261,6 +261,10 @@ static const struct {
261 { FC_PORTSPEED_8GBIT, "8 Gbit" }, 261 { FC_PORTSPEED_8GBIT, "8 Gbit" },
262 { FC_PORTSPEED_16GBIT, "16 Gbit" }, 262 { FC_PORTSPEED_16GBIT, "16 Gbit" },
263 { FC_PORTSPEED_32GBIT, "32 Gbit" }, 263 { FC_PORTSPEED_32GBIT, "32 Gbit" },
264 { FC_PORTSPEED_20GBIT, "20 Gbit" },
265 { FC_PORTSPEED_40GBIT, "40 Gbit" },
266 { FC_PORTSPEED_50GBIT, "50 Gbit" },
267 { FC_PORTSPEED_100GBIT, "100 Gbit" },
264 { FC_PORTSPEED_NOT_NEGOTIATED, "Not Negotiated" }, 268 { FC_PORTSPEED_NOT_NEGOTIATED, "Not Negotiated" },
265}; 269};
266fc_bitfield_name_search(port_speed, fc_port_speed_names) 270fc_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 8c79980dc8f2..007a0bc01b74 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -131,6 +131,10 @@ enum fc_vport_state {
131#define FC_PORTSPEED_8GBIT 0x10 131#define FC_PORTSPEED_8GBIT 0x10
132#define FC_PORTSPEED_16GBIT 0x20 132#define FC_PORTSPEED_16GBIT 0x20
133#define FC_PORTSPEED_32GBIT 0x40 133#define FC_PORTSPEED_32GBIT 0x40
134#define FC_PORTSPEED_20GBIT 0x80
135#define FC_PORTSPEED_40GBIT 0x100
136#define FC_PORTSPEED_50GBIT 0x200
137#define FC_PORTSPEED_100GBIT 0x400
134#define FC_PORTSPEED_NOT_NEGOTIATED (1 << 15) /* Speed not established */ 138#define FC_PORTSPEED_NOT_NEGOTIATED (1 << 15) /* Speed not established */
135 139
136/* 140/*