diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-08 20:33:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-08 20:33:13 -0400 |
commit | 555353cfa1aee293de445bfa6de43276138ddd82 (patch) | |
tree | b5daba85806b8e36731c4a474aac97f1a0140a51 /drivers/net/ifb.c | |
parent | dc2b48475a0a36f8b3bbb2da60d3a006dc5c2c84 (diff) |
netdev: The ingress_lock member is no longer needed.
Every qdisc is assosciated with a queue, and in the case of ingress
qdiscs that will now be netdev->rx_queue so using that queue's lock is
the thing to do.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ifb.c')
-rw-r--r-- | drivers/net/ifb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index bc3de272a829..ccbd6554f6eb 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c | |||
@@ -229,13 +229,13 @@ module_param(numifbs, int, 0); | |||
229 | MODULE_PARM_DESC(numifbs, "Number of ifb devices"); | 229 | MODULE_PARM_DESC(numifbs, "Number of ifb devices"); |
230 | 230 | ||
231 | /* | 231 | /* |
232 | * dev_ifb->tx_queue.lock is usually taken after dev->ingress_lock, | 232 | * dev_ifb->tx_queue.lock is usually taken after dev->rx_queue.lock, |
233 | * reversely to e.g. qdisc_lock_tree(). It should be safe until | 233 | * reversely to e.g. qdisc_lock_tree(). It should be safe until |
234 | * ifb doesn't take dev->tx_queue.lock with dev_ifb->ingress_lock. | 234 | * ifb doesn't take dev->tx_queue.lock with dev_ifb->rx_queue.lock. |
235 | * But lockdep should know that ifb has different locks from dev. | 235 | * But lockdep should know that ifb has different locks from dev. |
236 | */ | 236 | */ |
237 | static struct lock_class_key ifb_tx_queue_lock_key; | 237 | static struct lock_class_key ifb_tx_queue_lock_key; |
238 | static struct lock_class_key ifb_ingress_lock_key; | 238 | static struct lock_class_key ifb_rx_queue_lock_key; |
239 | 239 | ||
240 | 240 | ||
241 | static int __init ifb_init_one(int index) | 241 | static int __init ifb_init_one(int index) |
@@ -259,7 +259,7 @@ static int __init ifb_init_one(int index) | |||
259 | goto err; | 259 | goto err; |
260 | 260 | ||
261 | lockdep_set_class(&dev_ifb->tx_queue.lock, &ifb_tx_queue_lock_key); | 261 | lockdep_set_class(&dev_ifb->tx_queue.lock, &ifb_tx_queue_lock_key); |
262 | lockdep_set_class(&dev_ifb->ingress_lock, &ifb_ingress_lock_key); | 262 | lockdep_set_class(&dev_ifb->rx_queue.lock, &ifb_rx_queue_lock_key); |
263 | 263 | ||
264 | return 0; | 264 | return 0; |
265 | 265 | ||