Commit 581abbc2 authored Jun 19, 2008 by Andy Gospodarek Committed by Jeff Garzik Jun 27, 2008

e1000: only enable TSO6 via ethtool when using correct hardware



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>

parent 1923815d

drivers/net/e1000/e1000_ethtool.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -347,7 +347,7 @@ e1000_set_tso(struct net_device *netdev, u32 data)
	else		else
	netdev->features &= ~NETIF_F_TSO;		netdev->features &= ~NETIF_F_TSO;

	if (data)		if (data && (adapter->hw.mac_type > e1000_82547_rev_2))
	netdev->features \|= NETIF_F_TSO6;		netdev->features \|= NETIF_F_TSO6;
	else		else
	netdev->features &= ~NETIF_F_TSO6;		netdev->features &= ~NETIF_F_TSO6;