netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 3/4] e1000: only enable TSO6 via ethtool when using correct hardware
@ 2008-06-19 21:19 Andy Gospodarek
  2008-06-27  5:32 ` Jeff Garzik
  0 siblings, 1 reply; 2+ messages in thread
From: Andy Gospodarek @ 2008-06-19 21:19 UTC (permalink / raw)
  To: netdev; +Cc: jeffrey.t.kirsher, jesse.brandeburg


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>
---
 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 701531e..a3f6a9c 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, 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;
-- 
1.5.2.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 3/4] e1000: only enable TSO6 via ethtool when using correct hardware
  2008-06-19 21:19 [PATCH 3/4] e1000: only enable TSO6 via ethtool when using correct hardware Andy Gospodarek
@ 2008-06-27  5:32 ` Jeff Garzik
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2008-06-27  5:32 UTC (permalink / raw)
  To: Andy Gospodarek; +Cc: netdev, jeffrey.t.kirsher, jesse.brandeburg

Andy Gospodarek wrote:
> 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>
> ---
>  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 701531e..a3f6a9c 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, 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;

applied



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-06-27  5:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-19 21:19 [PATCH 3/4] e1000: only enable TSO6 via ethtool when using correct hardware Andy Gospodarek
2008-06-27  5:32 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).