Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 211c738d authored by Yi Zou's avatar Yi Zou Committed by James Bottomley
Browse files

[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: default avatarYi Zou <yi.zou@intel.com>
Acked-by: default avatarDavid Miller <davem@davemloft.net>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 7687fb92

drivers/scsi/fcoe/libfcoe.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

include/linux/if_ether.h

+1 −0
Original line number Diff line number Diff line
@@ -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 ] */



/*

include/scsi/fc/fc_fcoe.h

+0 −7
Original line number Diff line number Diff line
@@ -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.

 */