diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2010-10-22 04:38:26 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-09 13:26:44 -0800 |
| commit | 0785ba875cf1728a62c91856d312f5d89f8d2679 (patch) | |
| tree | 94b39dcfa56c6c8e1e87374055dd7e17053f7e71 /net/core | |
| parent | bf8dfc64f69b0160a915b5dbd2c39054ce295643 (diff) | |
| download | linux-stable-0785ba875cf1728a62c91856d312f5d89f8d2679.tar.gz linux-stable-0785ba875cf1728a62c91856d312f5d89f8d2679.tar.bz2 linux-stable-0785ba875cf1728a62c91856d312f5d89f8d2679.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/core')
| -rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 915d0aeb4616..d04cd93f22b5 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1484,10 +1484,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))); |