From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - forcedeth-fix-checksum-flag.patch removed from -mm tree Date: Thu, 28 Aug 2008 14:49:10 -0700 Message-ID: <200808282149.m7SLnAAG016169@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:50309 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755590AbYH1Vtd (ORCPT ); Thu, 28 Aug 2008 17:49:33 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: aabdulla@nvidia.com, jgarzik@pobox.com, manfred@colorfullife.com, stable@kernel.org, mm-commits@vger.kernel.org The patch titled forcedeth: fix checksum flag has been removed from the -mm tree. Its filename was forcedeth-fix-checksum-flag.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: forcedeth: fix checksum flag From: Ayaz Abdulla 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 Cc: Jeff Garzik Cc: Manfred Spraul [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton --- drivers/net/forcedeth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/net/forcedeth.c~forcedeth-fix-checksum-flag drivers/net/forcedeth.c --- a/drivers/net/forcedeth.c~forcedeth-fix-checksum-flag +++ a/drivers/net/forcedeth.c @@ -5530,7 +5530,7 @@ static int __devinit nv_probe(struct pci 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; } @@ -5843,7 +5843,7 @@ static int __devinit nv_probe(struct pci 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 " : "", _ Patches currently in -mm which might be from aabdulla@nvidia.com are linux-next.patch forcedeth-power-down-phy-when-interface-is-down.patch forcedeth-fix-mac-address-detection-on-network-card-regression-in-2623.patch forcedeth-add-pci_enable_device-to-nv_resume.patch forcedeth-fix-kexec-regression.patch