diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-17 03:34:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-17 22:21:00 -0400 |
commit | e8a0464cc950972824e2e128028ae3db666ec1ed (patch) | |
tree | 5022b95396c0f3b313531bc39b19543c03551b9a /drivers/net/macvlan.c | |
parent | 070825b3840a743e21ebcc44f8279708a4fed977 (diff) |
netdev: Allocate multiple queues for TX.
alloc_netdev_mq() now allocates an array of netdev_queue
structures for TX, based upon the queue_count argument.
Furthermore, all accesses to the TX queues are now vectored
through the netdev_get_tx_queue() and netdev_for_each_tx_queue()
interfaces. This makes it easy to grep the tree for all
things that want to get to a TX queue of a net device.
Problem spots which are not really multiqueue aware yet, and
only work with one queue, can easily be spotted by grepping
for all netdev_get_tx_queue() calls that pass in a zero index.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
-rw-r--r-- | drivers/net/macvlan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 980001c2cf96..72745ce588c6 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c | |||
@@ -285,7 +285,9 @@ static struct lock_class_key macvlan_netdev_xmit_lock_key; | |||
285 | #define MACVLAN_STATE_MASK \ | 285 | #define MACVLAN_STATE_MASK \ |
286 | ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT)) | 286 | ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT)) |
287 | 287 | ||
288 | static void macvlan_set_lockdep_class_one(struct netdev_queue *txq) | 288 | static void macvlan_set_lockdep_class_one(struct net_device *dev, |
289 | struct netdev_queue *txq, | ||
290 | void *_unused) | ||
289 | { | 291 | { |
290 | lockdep_set_class(&txq->_xmit_lock, | 292 | lockdep_set_class(&txq->_xmit_lock, |
291 | &macvlan_netdev_xmit_lock_key); | 293 | &macvlan_netdev_xmit_lock_key); |
@@ -293,7 +295,7 @@ static void macvlan_set_lockdep_class_one(struct netdev_queue *txq) | |||
293 | 295 | ||
294 | static void macvlan_set_lockdep_class(struct net_device *dev) | 296 | static void macvlan_set_lockdep_class(struct net_device *dev) |
295 | { | 297 | { |
296 | macvlan_set_lockdep_class_one(&dev->tx_queue); | 298 | netdev_for_each_tx_queue(dev, macvlan_set_lockdep_class_one, NULL); |
297 | } | 299 | } |
298 | 300 | ||
299 | static int macvlan_init(struct net_device *dev) | 301 | static int macvlan_init(struct net_device *dev) |