diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2005-11-07 00:58:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 07:53:25 -0800 |
| commit | d311b0d3d8fcc279132f7251704b23ec264a194f (patch) | |
| tree | 00ee7574ec4133d9b93edc138bb9491430884378 /drivers/net | |
| parent | 900fd17dd01d2c99dfd1ec0b53a860894a2673ee (diff) | |
| download | linux-d311b0d3d8fcc279132f7251704b23ec264a194f.tar.bz2 | |
[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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/3c59x.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index c1ee8efc9d56..7488ee7f7caf 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; |