[SCSI] net, fcoe: add ETH_P_FCOE for Fibre Channel over Ethernet (FCoE)

This adds eth type ETH_P_FCOE for Fibre Channel over Ethernet (FCoE),
consequently, the ETH_P_FCOE from fc_fcoe.h and fcoe skb->protocol
is not set as ETH_P_FCOE.

Signed-off-by: Yi Zou <yi.zou@intel.com>
Acked-by: David Miller <davem@davemloft.net>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
index 5548bf3bb58bbf44e70b79e5f4b4ddc8d6b97c76..a99a42807b38c63258de9f93f2b4c8a31491363d 100644 (file)
--- a/drivers/scsi/fcoe/libfcoe.c
+++ b/drivers/scsi/fcoe/libfcoe.c
@@ -460,7 +460,7 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp)
        skb_reset_mac_header(skb);
        skb_reset_network_header(skb);
        skb->mac_len = elen;
-       skb->protocol = htons(ETH_P_802_3);
+       skb->protocol = htons(ETH_P_FCOE);
        skb->dev = fc->real_dev;
 
        /* fill up mac and fcoe headers */

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 7f3c735f422bed8ff1cdeacc9450d61834f8dd19..59d197cb48519491ef69a84203d289db97a1553b 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -78,6 +78,7 @@
 #define ETH_P_PAE      0x888E          /* Port Access Entity (IEEE 802.1X) */
 #define ETH_P_AOE      0x88A2          /* ATA over Ethernet            */
 #define ETH_P_TIPC     0x88CA          /* TIPC                         */
+#define ETH_P_FCOE     0x8906          /* Fibre Channel over Ethernet  */
 #define ETH_P_EDSA     0xDADA          /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
 
 /*

diff --git a/include/scsi/fc/fc_fcoe.h b/include/scsi/fc/fc_fcoe.h
index f271d9cc0fc2e27f950eb97ef2f325da3989167e..ccb3dbe90463b134dfe5afb745653b59af9a204b 100644 (file)
--- a/include/scsi/fc/fc_fcoe.h
+++ b/include/scsi/fc/fc_fcoe.h
@@ -24,13 +24,6 @@
  * FCoE - Fibre Channel over Ethernet.
  */
 
-/*
- * The FCoE ethertype eventually goes in net/if_ether.h.
- */
-#ifndef ETH_P_FCOE
-#define        ETH_P_FCOE      0x8906          /* FCOE ether type */
-#endif
-
 /*
  * FC_FCOE_OUI hasn't been standardized yet.   XXX TBD.
  */