aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zou <yi.zou@intel.com>2009-02-27 17:06:37 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-03-13 16:09:00 -0400
commit211c738d86f3f423f1b218ab3a356c9538e38047 (patch)
treeb94677af2975bd2a455beb9ad3056e86d73cba70
parent7687fb9209422d35334995b8ace38de92e595d16 (diff)
[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>
-rw-r--r--drivers/scsi/fcoe/libfcoe.c2
-rw-r--r--include/linux/if_ether.h1
-rw-r--r--include/scsi/fc/fc_fcoe.h7
3 files changed, 2 insertions, 8 deletions
diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
index 5548bf3bb58b..a99a42807b38 100644
--- 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)
460 skb_reset_mac_header(skb); 460 skb_reset_mac_header(skb);
461 skb_reset_network_header(skb); 461 skb_reset_network_header(skb);
462 skb->mac_len = elen; 462 skb->mac_len = elen;
463 skb->protocol = htons(ETH_P_802_3); 463 skb->protocol = htons(ETH_P_FCOE);
464 skb->dev = fc->real_dev; 464 skb->dev = fc->real_dev;
465 465
466 /* fill up mac and fcoe headers */ 466 /* fill up mac and fcoe headers */
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 7f3c735f422b..59d197cb4851 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -78,6 +78,7 @@
78#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ 78#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
79#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ 79#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */
80#define ETH_P_TIPC 0x88CA /* TIPC */ 80#define ETH_P_TIPC 0x88CA /* TIPC */
81#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */
81#define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ 82#define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
82 83
83/* 84/*
diff --git a/include/scsi/fc/fc_fcoe.h b/include/scsi/fc/fc_fcoe.h
index f271d9cc0fc2..ccb3dbe90463 100644
--- a/include/scsi/fc/fc_fcoe.h
+++ b/include/scsi/fc/fc_fcoe.h
@@ -25,13 +25,6 @@
25 */ 25 */
26 26
27/* 27/*
28 * The FCoE ethertype eventually goes in net/if_ether.h.
29 */
30#ifndef ETH_P_FCOE
31#define ETH_P_FCOE 0x8906 /* FCOE ether type */
32#endif
33
34/*
35 * FC_FCOE_OUI hasn't been standardized yet. XXX TBD. 28 * FC_FCOE_OUI hasn't been standardized yet. XXX TBD.
36 */ 29 */
37#ifndef FC_FCOE_OUI 30#ifndef FC_FCOE_OUI