From: Yi Zou <yi.zou@intel.com>
To: netdev@vger.kernel.org, linux-scsi@vger.kernel.org
Cc: yi.zou@intel.com
Subject: [PATCH 01/11] net, fcoe: add ETH_P_FCOE for Fibre Channel over Ethernet (FCoE)
Date: Fri, 27 Feb 2009 14:06:37 -0800 [thread overview]
Message-ID: <20090227220637.4987.6729.stgit.yi.zou@intel.com> (raw)
In-Reply-To: <20090227220034.4987.50755.stgit@localhost.localdomain>
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>
---
drivers/scsi/fcoe/libfcoe.c | 2 +-
include/linux/if_ether.h | 1 +
include/scsi/fc/fc_fcoe.h | 7 -------
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
index 5548bf3..a99a428 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)
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 7f3c735..59d197c 100644
--- 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 f271d9c..ccb3dbe 100644
--- a/include/scsi/fc/fc_fcoe.h
+++ b/include/scsi/fc/fc_fcoe.h
@@ -25,13 +25,6 @@
*/
/*
- * 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.
*/
#ifndef FC_FCOE_OUI
next parent reply other threads:[~2009-02-27 23:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20090227220034.4987.50755.stgit@localhost.localdomain>
2009-02-27 22:06 ` Yi Zou [this message]
2009-02-27 22:06 ` [PATCH 02/11] net: reclaim 8 upper bits of the netdev->features from GSO Yi Zou
2009-02-27 22:06 ` [PATCH 03/11] net: define feature flags for FCoE offloads Yi Zou
2009-02-27 22:06 ` [PATCH 04/11] net: add NETIF_F_FCOE_CRC to can_checksum_protocol Yi Zou
2009-02-27 22:06 ` [PATCH 05/11] net: add FCoE offload support through net_device Yi Zou
2009-02-27 22:07 ` [PATCH 06/11] fcoe, libfc: check offload features from LLD through netdev Yi Zou
2009-02-27 22:07 ` [PATCH 07/11] libfc: use lso_max for sequence offload Yi Zou
2009-02-27 22:07 ` [PATCH 08/11] fcoe: add support to large send by gso through net_device for fcoe_sw Yi Zou
2009-02-27 22:07 ` [PATCH 09/11] libfc: add support of large receive offload by ddp in fc_fcp Yi Zou
2009-02-27 22:07 ` [PATCH 10/11] fcoe: add support to FCoE offload support in fcoe_sw through net_device Yi Zou
2009-02-27 22:07 ` [PATCH 11/11] fcoe: fcoe fc crc offload indication by skb->ip_summed Yi Zou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090227220637.4987.6729.stgit.yi.zou@intel.com \
--to=yi.zou@intel.com \
--cc=linux-scsi@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).