From 4f5676b1fef9373831dbed91689511ee991535ea Mon Sep 17 00:00:00 2001
From: Joe Eykholt <jeykholt@cisco.com>
Date: Fri, 11 Jun 2010 16:43:59 -0700
Subject: [PATCH] --- yaml --- r: 204114 b: refs/heads/master c:
 5d4a2e29fba5b2bef95b96a46b338ec4d76fa4fd h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/include/scsi/fc/fc_fcoe.h | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 4d52bc6a2794..39130132f212 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 618461c02b00a658ec8aa07d409cd496a7e254e2
+refs/heads/master: 5d4a2e29fba5b2bef95b96a46b338ec4d76fa4fd
diff --git a/trunk/include/scsi/fc/fc_fcoe.h b/trunk/include/scsi/fc/fc_fcoe.h
index e6ad3d2ae475..d5dcd6062815 100644
--- a/trunk/include/scsi/fc/fc_fcoe.h
+++ b/trunk/include/scsi/fc/fc_fcoe.h
@@ -22,23 +22,18 @@
 
 /*
  * FCoE - Fibre Channel over Ethernet.
+ * See T11 FC-BB-5 Rev 2.00 (09-056v5.pdf)
  */
 
 /*
- * FC_FCOE_OUI hasn't been standardized yet.   XXX TBD.
+ * Default FC_FCOE_OUI / FC-MAP value.
  */
-#ifndef FC_FCOE_OUI
-#define	FC_FCOE_OUI	0x0efc00	/* upper 24 bits of FCOE dest MAC TBD */
-#endif
+#define	FC_FCOE_OUI	0x0efc00	/* upper 24 bits of FCOE MAC */
 
 /*
- * The destination MAC address for the fabric login may get a different OUI.
- * This isn't standardized yet.
+ * Fabric Login (FLOGI) MAC for non-FIP use.  Non-FIP use is deprecated.
  */
-#ifndef FC_FCOE_FLOGI_MAC
-/* gateway MAC - TBD */
 #define	FC_FCOE_FLOGI_MAC { 0x0e, 0xfc, 0x00, 0xff, 0xff, 0xfe }
-#endif
 
 #define	FC_FCOE_VER	0			/* version */
 
@@ -51,8 +46,6 @@
 
 /*
  * FCoE frame header - 14 bytes
- *
- * This is the August 2007 version of the FCoE header as defined by T11.
  * This follows the VLAN header, which includes the ethertype.
  */
 struct fcoe_hdr {