Bladeren bron

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>
Andy Gospodarek 17 jaren geleden
bovenliggende
commit
581abbc26a
1 gewijzigde bestanden met toevoegingen van 1 en 1 verwijderingen
  1. 1 1
      drivers/net/e1000/e1000_ethtool.c

+ 1 - 1
drivers/net/e1000/e1000_ethtool.c

@@ -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;