e1000: only enable TSO6 via ethtool when using correct hardware
authorAndy Gospodarek <andy@greyhouse.net>
Thu, 19 Jun 2008 21:19:02 +0000 (17:19 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Fri, 27 Jun 2008 05:31:08 +0000 (01:31 -0400)
When enabling TSO via ethool on e1000, it is possible to set
NETIF_F_TSO6 on hardware that does not support it.  Setting TSO via
ethtool now matches the settings used when the hardware is probed.

Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/e1000/e1000_ethtool.c

index 701531e72e7b3b4d1ddab378e5b05795c320d052..a3f6a9c72ec8546b11ab987b27ea330ca1fba5e2 100644 (file)
@@ -347,7 +347,7 @@ e1000_set_tso(struct net_device *netdev, u32 data)
        else
                netdev->features &= ~NETIF_F_TSO;
 
-       if (data)
+       if (data && (adapter->hw.mac_type > e1000_82547_rev_2))
                netdev->features |= NETIF_F_TSO6;
        else
                netdev->features &= ~NETIF_F_TSO6;