[PATCH] e1000: disable TSO for now

* Disable TSO as default setting until some hangs/resets caused
  with TSO enabled are root-caused.  TSO can still be manually
  enabled using ethtool -K.

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 64ebae440a4bec3a936b6bc23adc6d06ff8a60d2..900f903ac9f257587fb15d209bae2fd8ce4c87ca 100644 (file)
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -474,9 +474,14 @@ e1000_probe(struct pci_dev *pdev,
        }
 
 #ifdef NETIF_F_TSO
+#ifdef BROKEN_ON_NON_IA_ARCHS
+       /* Disbaled for now until root-cause is found for
+        * hangs reported against non-IA archs.  TSO can be
+        * enabled using ethtool -K eth<x> tso on */
        if((adapter->hw.mac_type >= e1000_82544) &&
           (adapter->hw.mac_type != e1000_82547))
                netdev->features |= NETIF_F_TSO;
+#endif
 #endif
 
        if(pci_using_dac)