From 9d679561e0934f03914961195acf804fb494e575 Mon Sep 17 00:00:00 2001 From: Yi Zou Date: Fri, 27 Feb 2009 14:06:54 -0800 Subject: [PATCH] --- yaml --- r: 136301 b: refs/heads/master c: 1c8dbcf6496c2612d883a8bc6bccc38000e14866 h: refs/heads/master i: 136299: 433f97e2fce470ca2298750943afd417dcf50b67 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 317addec87b2..0783d91002cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01d5b2fca1fa58ed5039239fd531e9f658971ace +refs/heads/master: 1c8dbcf6496c2612d883a8bc6bccc38000e14866 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 72b0d26fd46d..3d3670640c2d 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1457,7 +1457,9 @@ static bool can_checksum_protocol(unsigned long features, __be16 protocol) ((features & NETIF_F_IP_CSUM) && protocol == htons(ETH_P_IP)) || ((features & NETIF_F_IPV6_CSUM) && - protocol == htons(ETH_P_IPV6))); + protocol == htons(ETH_P_IPV6)) || + ((features & NETIF_F_FCOE_CRC) && + protocol == htons(ETH_P_FCOE))); } static bool dev_can_checksum(struct net_device *dev, struct sk_buff *skb)