diff options
author | Ayaz Abdulla <aabdulla@nvidia.com> | 2008-08-20 19:34:37 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-27 05:55:04 -0400 |
commit | edcfe5f7e307846e578fb88d69fa27051fded0ab (patch) | |
tree | 8aa30370ad87f448d503de2d4d08eb8f8afb0680 /drivers/net/forcedeth.c | |
parent | 1025433147e635af9cd150676a097396cf666ddb (diff) |
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: 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>
Diffstat (limited to 'drivers/net/forcedeth.c')
-rw-r--r-- | drivers/net/forcedeth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 053971e5fc94..331b86b01fa9 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -5522,7 +5522,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
5522 | if (id->driver_data & DEV_HAS_CHECKSUM) { | 5522 | if (id->driver_data & DEV_HAS_CHECKSUM) { |
5523 | np->rx_csum = 1; | 5523 | np->rx_csum = 1; |
5524 | np->txrxctl_bits |= NVREG_TXRXCTL_RXCHECK; | 5524 | np->txrxctl_bits |= NVREG_TXRXCTL_RXCHECK; |
5525 | dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG; | 5525 | dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG; |
5526 | dev->features |= NETIF_F_TSO; | 5526 | dev->features |= NETIF_F_TSO; |
5527 | } | 5527 | } |
5528 | 5528 | ||
@@ -5835,7 +5835,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
5835 | 5835 | ||
5836 | dev_printk(KERN_INFO, &pci_dev->dev, "%s%s%s%s%s%s%s%s%s%sdesc-v%u\n", | 5836 | dev_printk(KERN_INFO, &pci_dev->dev, "%s%s%s%s%s%s%s%s%s%sdesc-v%u\n", |
5837 | dev->features & NETIF_F_HIGHDMA ? "highdma " : "", | 5837 | dev->features & NETIF_F_HIGHDMA ? "highdma " : "", |
5838 | dev->features & (NETIF_F_HW_CSUM | NETIF_F_SG) ? | 5838 | dev->features & (NETIF_F_IP_CSUM | NETIF_F_SG) ? |
5839 | "csum " : "", | 5839 | "csum " : "", |
5840 | dev->features & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ? | 5840 | dev->features & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ? |
5841 | "vlan " : "", | 5841 | "vlan " : "", |