iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Yi Zou 2009-02-27 14:06:37 -08:00 committed by James Bottomley
parent 7687fb9209
commit 211c738d86
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/fcoe/libfcoe.c
View File

@ -460,7 +460,7 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp)
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
skb_reset_network_header(skb); skb_reset_network_header(skb);
skb->mac_len = elen; skb->mac_len = elen;
skb->protocol = htons(ETH_P_802_3); skb->protocol = htons(ETH_P_FCOE);
skb->dev = fc->real_dev; skb->dev = fc->real_dev;
/* fill up mac and fcoe headers */ /* fill up mac and fcoe headers */

1
include/linux/if_ether.h
View File

@ -78,6 +78,7 @@
#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ #define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ #define ETH_P_AOE 0x88A2 /* ATA over Ethernet */
#define ETH_P_TIPC 0x88CA /* TIPC */ #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 ] */ #define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
/* /*

7
include/scsi/fc/fc_fcoe.h
View File

@ -24,13 +24,6 @@
* FCoE - Fibre Channel over Ethernet. * 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. * FC_FCOE_OUI hasn't been standardized yet. XXX TBD.
*/ */