提交 d311b0d3 编写于 作者: S Stephen Hemminger 提交者: Linus Torvalds

[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: NStephen Hemminger <shemminger@osdl.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 900fd17d
...@@ -1536,11 +1536,10 @@ static int __devinit vortex_probe1(struct device *gendev, ...@@ -1536,11 +1536,10 @@ static int __devinit vortex_probe1(struct device *gendev,
if (vp->full_bus_master_tx) { if (vp->full_bus_master_tx) {
dev->hard_start_xmit = boomerang_start_xmit; dev->hard_start_xmit = boomerang_start_xmit;
/* Actually, it still should work with iommu. */ /* Actually, it still should work with iommu. */
dev->features |= NETIF_F_SG;
if (card_idx < MAX_UNITS && if (card_idx < MAX_UNITS &&
((hw_checksums[card_idx] == -1 && (vp->drv_flags & HAS_HWCKSM)) || ((hw_checksums[card_idx] == -1 && (vp->drv_flags & HAS_HWCKSM)) ||
hw_checksums[card_idx] == 1)) { hw_checksums[card_idx] == 1)) {
dev->features |= NETIF_F_IP_CSUM; dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
} }
} else { } else {
dev->hard_start_xmit = vortex_start_xmit; dev->hard_start_xmit = vortex_start_xmit;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册