| Message ID | 20081006220926.3308.48505.stgit@zyfc9ini.jf.intel.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, 2008-10-06 at 15:09 -0700, Yi Zou wrote: > From: Chris Leech <christopher.leech@intel.com> > > Signed-off-by: Chris Leech <christopher.leech@intel.com> > Signed-off-by: Yi Zou <yi.zou@intel.com> > --- > > include/linux/netdevice.h | 3 +++ > include/linux/skbuff.h | 2 ++ > 2 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h > index 9cfd20b..ef65927 100644 > --- a/include/linux/netdevice.h > +++ b/include/linux/netdevice.h > @@ -522,6 +522,8 @@ struct net_device > #define NETIF_F_NETNS_LOCAL 8192 /* Does not change network namespaces */ > #define NETIF_F_LRO 32768 /* large receive offload */ > > +#define NETIF_F_FCOE_CRC (1 << 24) /* FCoE CRC32 */ > + > /* Segmentation offload features */ > #define NETIF_F_GSO_SHIFT 16 > #define NETIF_F_GSO_MASK 0xffff0000 [...] NETIF_F_FCOE_CRC shouldn't be included in NETIF_F_GSO_MASK. Ben.
>> >> +#define NETIF_F_FCOE_CRC (1 << 24) /* FCoE CRC32 */ >> + >> /* Segmentation offload features */ >> #define NETIF_F_GSO_SHIFT 16 >> #define NETIF_F_GSO_MASK 0xffff0000 >[...] > >NETIF_F_FCOE_CRC shouldn't be included in NETIF_F_GSO_MASK. > >Ben. > I apologize for this patch as one patch to claim the a few bits back from SKB_GSO_MASK was missing here in the original series. I shall resubmit the complete series to have all patches included, plus fixing the style issue in the first patch. Thanks. yi -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 9cfd20b..ef65927 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -522,6 +522,8 @@ struct net_device #define NETIF_F_NETNS_LOCAL 8192 /* Does not change network namespaces */ #define NETIF_F_LRO 32768 /* large receive offload */ +#define NETIF_F_FCOE_CRC (1 << 24) /* FCoE CRC32 */ + /* Segmentation offload features */ #define NETIF_F_GSO_SHIFT 16 #define NETIF_F_GSO_MASK 0xffff0000 @@ -530,6 +532,7 @@ struct net_device #define NETIF_F_GSO_ROBUST (SKB_GSO_DODGY << NETIF_F_GSO_SHIFT) #define NETIF_F_TSO_ECN (SKB_GSO_TCP_ECN << NETIF_F_GSO_SHIFT) #define NETIF_F_TSO6 (SKB_GSO_TCPV6 << NETIF_F_GSO_SHIFT) +#define NETIF_F_GSO_FCOE (SKB_GSO_FCOE << NETIF_F_GSO_SHIFT) /* List of features with software fallbacks. */ #define NETIF_F_GSO_SOFTWARE (NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 720b688..be60560 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -188,6 +188,8 @@ enum { SKB_GSO_TCP_ECN = 1 << 3, SKB_GSO_TCPV6 = 1 << 4, + + SKB_GSO_FCOE = 1 << 5, }; #if BITS_PER_LONG > 32