Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into...

[linux-2.6-omap-h63xx.git] / drivers / net / ixgbe / ixgbe_ethtool.c

diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 12990b1fe7e41b267d724b1c200f227cfb1d597c..3efe5dda10af29d957f445a62564249a5bc4c8ec 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -252,22 +252,10 @@ static int ixgbe_set_tso(struct net_device *netdev, u32 data)
                netdev->features |= NETIF_F_TSO;
                netdev->features |= NETIF_F_TSO6;
        } else {
-#ifdef CONFIG_NETDEVICES_MULTIQUEUE
-               struct ixgbe_adapter *adapter = netdev_priv(netdev);
-               int i;
-#endif
-               netif_stop_queue(netdev);
-#ifdef CONFIG_NETDEVICES_MULTIQUEUE
-               for (i = 0; i < adapter->num_tx_queues; i++)
-                       netif_stop_subqueue(netdev, i);
-#endif
+               netif_tx_stop_all_queues(netdev);
                netdev->features &= ~NETIF_F_TSO;
                netdev->features &= ~NETIF_F_TSO6;
-#ifdef CONFIG_NETDEVICES_MULTIQUEUE
-               for (i = 0; i < adapter->num_tx_queues; i++)
-                       netif_start_subqueue(netdev, i);
-#endif
-               netif_start_queue(netdev);
+               netif_tx_start_all_queues(netdev);
        }
        return 0;
 }