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

Commit d311b0d3 authored Nov 07, 2005 by Stephen Hemminger Committed by Linus Torvalds Nov 07, 2005

[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>

parent 900fd17d

drivers/net/3c59x.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;