From: Stephen Hemminger <shemminger@osdl.org>
Date: Mon, 7 Nov 2005 08:58:09 +0000 (-0800)
Subject: [PATCH] 3c59x: don't enable scatter/gather w/o checksum support
X-Git-Tag: v2.6.15-rc1~693
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d311b0d3d8fcc279132f7251704b23ec264a194f;p=linux-2.6

[PATCH] 3c59x: don't enable scatter/gather w/o checksum support

It is not valid to enable scatter/gather without hardware checksum support
of some kind. (akpm: applies only to the old boomerang cards).

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index c1ee8efc9d..7488ee7f7c 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1536,11 +1536,10 @@ static int __devinit vortex_probe1(struct device *gendev,
 	if (vp->full_bus_master_tx) {
 		dev->hard_start_xmit = boomerang_start_xmit;
 		/* Actually, it still should work with iommu. */
-		dev->features |= NETIF_F_SG;
 		if (card_idx < MAX_UNITS &&
 		    ((hw_checksums[card_idx] == -1 && (vp->drv_flags & HAS_HWCKSM)) ||
 				hw_checksums[card_idx] == 1)) {
-			dev->features |= NETIF_F_IP_CSUM;
+			dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
 		}
 	} else {
 		dev->hard_start_xmit = vortex_start_xmit;