| Message ID | 1287758306.2316.35.camel@achroite.uk.solarflarecom.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Ben Hutchings <bhutchings@solarflare.com> Date: Fri, 22 Oct 2010 15:38:26 +0100 > 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> > Cc: stable@kernel.org [2.6.32+] Applied, thanks a lot Ben. -- 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/net/core/dev.c b/net/core/dev.c index a698252..8ab61de 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1683,10 +1683,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)));
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> Cc: stable@kernel.org [2.6.32+] --- net/core/dev.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)