diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-17 04:52:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-17 22:21:03 -0400 |
commit | 09e83b5d7d1878065e2453239b49b684cd0fe4e5 (patch) | |
tree | a08d06c81d7bcd47e432443e24b126101ea1f2b9 /include/linux/netdevice.h | |
parent | e8a0464cc950972824e2e128028ae3db666ec1ed (diff) |
netdev: Kill NETIF_F_MULTI_QUEUE.
There is no need for a feature bit for something that
can be tested by simply checking the TX queue count.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index f25d4f5a31b0..c02227b9dd7b 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -533,7 +533,6 @@ struct net_device | |||
533 | #define NETIF_F_LLTX 4096 /* LockLess TX - deprecated. Please */ | 533 | #define NETIF_F_LLTX 4096 /* LockLess TX - deprecated. Please */ |
534 | /* do not use LLTX in new drivers */ | 534 | /* do not use LLTX in new drivers */ |
535 | #define NETIF_F_NETNS_LOCAL 8192 /* Does not change network namespaces */ | 535 | #define NETIF_F_NETNS_LOCAL 8192 /* Does not change network namespaces */ |
536 | #define NETIF_F_MULTI_QUEUE 16384 /* Has multiple TX/RX queues */ | ||
537 | #define NETIF_F_LRO 32768 /* large receive offload */ | 536 | #define NETIF_F_LRO 32768 /* large receive offload */ |
538 | 537 | ||
539 | /* Segmentation offload features */ | 538 | /* Segmentation offload features */ |
@@ -1163,11 +1162,10 @@ static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index) | |||
1163 | * @dev: network device | 1162 | * @dev: network device |
1164 | * | 1163 | * |
1165 | * Check if device has multiple transmit queues | 1164 | * Check if device has multiple transmit queues |
1166 | * Always falls if NETDEVICE_MULTIQUEUE is not configured | ||
1167 | */ | 1165 | */ |
1168 | static inline int netif_is_multiqueue(const struct net_device *dev) | 1166 | static inline int netif_is_multiqueue(const struct net_device *dev) |
1169 | { | 1167 | { |
1170 | return (!!(NETIF_F_MULTI_QUEUE & dev->features)); | 1168 | return (dev->num_tx_queues > 1); |
1171 | } | 1169 | } |
1172 | 1170 | ||
1173 | /* Use this variant when it is known for sure that it | 1171 | /* Use this variant when it is known for sure that it |