Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edcfe5f7 authored by Ayaz Abdulla's avatar Ayaz Abdulla Committed by Jeff Garzik
Browse files

forcedeth: fix checksum flag 



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: default avatarAyaz 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 10254331

drivers/net/forcedeth.c

+2 −2
Original line number Diff line number Diff line
@@ -5522,7 +5522,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i 
	if (id->driver_data & DEV_HAS_CHECKSUM) {

		np->rx_csum = 1;

		np->txrxctl_bits |= NVREG_TXRXCTL_RXCHECK;

		dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG;

		dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;

		dev->features |= NETIF_F_TSO;

	}
@@ -5835,7 +5835,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i 


	dev_printk(KERN_INFO, &pci_dev->dev, "%s%s%s%s%s%s%s%s%s%sdesc-v%u\n",

		   dev->features & NETIF_F_HIGHDMA ? "highdma " : "",

		   dev->features & (NETIF_F_HW_CSUM | NETIF_F_SG) ?

		   dev->features & (NETIF_F_IP_CSUM | NETIF_F_SG) ?

		   	"csum " : "",

		   dev->features & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ?

		   	"vlan " : "",