diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-09 02:14:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-09 02:14:24 -0400 |
commit | b19fa1fa91845234961c64dbd564671aa7c0fd27 (patch) | |
tree | efb09da87299ef503b59396b69a7667f1650e378 /drivers/net/ixgbe/ixgbe_ethtool.c | |
parent | c773e847ea8f6812804e40f52399c6921a00eab1 (diff) |
net: Delete NETDEVICES_MULTIQUEUE kconfig option.
Multiple TX queue support is a core networking feature.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_ethtool.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_ethtool.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c index 12990b1fe7e4..81b769093d22 100644 --- a/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ixgbe/ixgbe_ethtool.c | |||
@@ -252,21 +252,15 @@ static int ixgbe_set_tso(struct net_device *netdev, u32 data) | |||
252 | netdev->features |= NETIF_F_TSO; | 252 | netdev->features |= NETIF_F_TSO; |
253 | netdev->features |= NETIF_F_TSO6; | 253 | netdev->features |= NETIF_F_TSO6; |
254 | } else { | 254 | } else { |
255 | #ifdef CONFIG_NETDEVICES_MULTIQUEUE | ||
256 | struct ixgbe_adapter *adapter = netdev_priv(netdev); | 255 | struct ixgbe_adapter *adapter = netdev_priv(netdev); |
257 | int i; | 256 | int i; |
258 | #endif | ||
259 | netif_stop_queue(netdev); | 257 | netif_stop_queue(netdev); |
260 | #ifdef CONFIG_NETDEVICES_MULTIQUEUE | ||
261 | for (i = 0; i < adapter->num_tx_queues; i++) | 258 | for (i = 0; i < adapter->num_tx_queues; i++) |
262 | netif_stop_subqueue(netdev, i); | 259 | netif_stop_subqueue(netdev, i); |
263 | #endif | ||
264 | netdev->features &= ~NETIF_F_TSO; | 260 | netdev->features &= ~NETIF_F_TSO; |
265 | netdev->features &= ~NETIF_F_TSO6; | 261 | netdev->features &= ~NETIF_F_TSO6; |
266 | #ifdef CONFIG_NETDEVICES_MULTIQUEUE | ||
267 | for (i = 0; i < adapter->num_tx_queues; i++) | 262 | for (i = 0; i < adapter->num_tx_queues; i++) |
268 | netif_start_subqueue(netdev, i); | 263 | netif_start_subqueue(netdev, i); |
269 | #endif | ||
270 | netif_start_queue(netdev); | 264 | netif_start_queue(netdev); |
271 | } | 265 | } |
272 | return 0; | 266 | return 0; |