From 743a8f4b8019398ca3544232f9017f11eef84cf5 Mon Sep 17 00:00:00 2001 From: Andrew Gospodarek Date: Tue, 10 Jun 2008 13:06:11 -0400 Subject: [PATCH] e1000: correctly set TSO6 fields via ethtool RHBZ 449175 When calling e1000_probe the correct settings for TSO are made, but these can be incorrectly overwritten when enabling TSO using ethtool. This patch fixes that. --- drivers/net/e1000/e1000_ethtool.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index e9a8b86..e86255e 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c @@ -347,7 +347,7 @@ e1000_set_tso(struct net_device *netdev, uint32_t 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; -- 1.5.2.1