diff options
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 af233b591534..bc3de272a829 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c | |||
@@ -229,12 +229,12 @@ 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->queue_lock is usually taken after dev->ingress_lock, | 232 | * dev_ifb->tx_queue.lock is usually taken after dev->ingress_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->queue_lock with dev_ifb->ingress_lock. | 234 | * ifb doesn't take dev->tx_queue.lock with dev_ifb->ingress_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_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_ingress_lock_key; |
239 | 239 | ||
240 | 240 | ||
@@ -258,7 +258,7 @@ static int __init ifb_init_one(int index) | |||
258 | if (err < 0) | 258 | if (err < 0) |
259 | goto err; | 259 | goto err; |
260 | 260 | ||
261 | lockdep_set_class(&dev_ifb->queue_lock, &ifb_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->ingress_lock, &ifb_ingress_lock_key); |
263 | 263 | ||
264 | return 0; | 264 | return 0; |