• R/O
  • HTTP
  • SSH
  • HTTPS

linux-2.4.36: Commit

2.4.36-stable kernel tree


Commit MetaInfo

Revisionb4343b5e489aeb2287d1f41a9cd176c987146cbe (tree)
Time2008-11-09 23:45:27
AuthorAyaz Abdulla <aabdulla@nvid...>
CommiterWilly Tarreau

Log Message

forcedeth: fix checksum flag

[backport of 2.6 commit edcfe5f7e307846e578fb88d69fa27051fded0ab]

Fix the checksum feature advertised in device flags. The hardware support
TCP/UDP over IPv4 and TCP/UDP over IPv6 (without IPv6 extension headers).
However, the kernel feature flags do not distinguish IPv6 with/without
extension headers.

Therefore, the driver needs to use NETIF_F_IP_CSUM instead of
NETIF_F_HW_CSUM since the latter includes all IPv6 packets.

A future patch can be created to check for extension headers and perform
software checksum calculation.

Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Manfred Spraul <manfred@colorfullife.com
Cc: <stable@kernel.org> [2.6.25.x, 2.6.26.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>

Change Summary

Incremental Difference

--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -2553,7 +2553,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
25532553
25542554 if (id->driver_data & DEV_HAS_CHECKSUM) {
25552555 np->txrxctl_bits |= NVREG_TXRXCTL_RXCHECK;
2556- dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG;
2556+ dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
25572557 #ifdef NETIF_F_TSO
25582558 dev->features |= NETIF_F_TSO;
25592559 #endif
Show on old repository browser