Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d311b0d3d8fcc279132f7251704b23ec264a194f

Authored by Stephen Hemminger
Committed by Linus Torvalds
1 parent 900fd17dd0
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Showing 1 changed file with 1 additions and 2 deletions Side-by-side Diff

... ... @@ -1536,11 +1536,10 @@
1536 1536 if (vp->full_bus_master_tx) {
1537 1537 dev->hard_start_xmit = boomerang_start_xmit;
1538 1538 /* Actually, it still should work with iommu. */
1539   - dev->features |= NETIF_F_SG;
1540 1539 if (card_idx < MAX_UNITS &&
1541 1540 ((hw_checksums[card_idx] == -1 && (vp->drv_flags & HAS_HWCKSM)) ||
1542 1541 hw_checksums[card_idx] == 1)) {
1543   - dev->features |= NETIF_F_IP_CSUM;
  1542 + dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
1544 1543 }
1545 1544 } else {
1546 1545 dev->hard_start_xmit = vortex_start_xmit;