summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-10-22 04:38:26 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-09 13:32:37 -0800
commitffe7d99b862d4c70e1eb214605ff7e24e55c547a (patch)
tree1ed03ffbffa1bc278efe27a751c62babf0d61a43 /net
parentf3aa864b00bbcd49327d7911f8c39a65e51e2ca9 (diff)
downloadlinux-3.10-ffe7d99b862d4c70e1eb214605ff7e24e55c547a.tar.gz
linux-3.10-ffe7d99b862d4c70e1eb214605ff7e24e55c547a.tar.bz2
linux-3.10-ffe7d99b862d4c70e1eb214605ff7e24e55c547a.zip
net: NETIF_F_HW_CSUM does not imply FCoE CRC offload
commit 66c68bcc489fadd4f5e8839e966e3a366e50d1d5 upstream. NETIF_F_HW_CSUM indicates the ability to update an TCP/IP-style 16-bit checksum with the checksum of an arbitrary part of the packet data, whereas the FCoE CRC is something entirely different. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 660dd41aaaa..dd20c56ba99 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1648,10 +1648,10 @@ EXPORT_SYMBOL(netif_device_attach);
static bool can_checksum_protocol(unsigned long features, __be16 protocol)
{
- return ((features & NETIF_F_GEN_CSUM) ||
- ((features & NETIF_F_IP_CSUM) &&
+ return ((features & NETIF_F_NO_CSUM) ||
+ ((features & NETIF_F_V4_CSUM) &&
protocol == htons(ETH_P_IP)) ||
- ((features & NETIF_F_IPV6_CSUM) &&
+ ((features & NETIF_F_V6_CSUM) &&
protocol == htons(ETH_P_IPV6)) ||
((features & NETIF_F_FCOE_CRC) &&
protocol == htons(ETH_P_FCOE)));