diff options
Diffstat (limited to 'drivers/net/ifb.c')
| -rw-r--r-- | drivers/net/ifb.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index af233b591534..0960e69b2da4 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
| 36 | #include <net/pkt_sched.h> | 36 | #include <net/pkt_sched.h> |
| 37 | #include <net/net_namespace.h> | 37 | #include <net/net_namespace.h> |
| 38 | #include <linux/lockdep.h> | ||
| 39 | 38 | ||
| 40 | #define TX_TIMEOUT (2*HZ) | 39 | #define TX_TIMEOUT (2*HZ) |
| 41 | 40 | ||
| @@ -228,16 +227,6 @@ static struct rtnl_link_ops ifb_link_ops __read_mostly = { | |||
| 228 | module_param(numifbs, int, 0); | 227 | module_param(numifbs, int, 0); |
| 229 | MODULE_PARM_DESC(numifbs, "Number of ifb devices"); | 228 | MODULE_PARM_DESC(numifbs, "Number of ifb devices"); |
| 230 | 229 | ||
| 231 | /* | ||
| 232 | * dev_ifb->queue_lock is usually taken after dev->ingress_lock, | ||
| 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. | ||
| 235 | * But lockdep should know that ifb has different locks from dev. | ||
| 236 | */ | ||
| 237 | static struct lock_class_key ifb_queue_lock_key; | ||
| 238 | static struct lock_class_key ifb_ingress_lock_key; | ||
| 239 | |||
| 240 | |||
| 241 | static int __init ifb_init_one(int index) | 230 | static int __init ifb_init_one(int index) |
| 242 | { | 231 | { |
| 243 | struct net_device *dev_ifb; | 232 | struct net_device *dev_ifb; |
| @@ -258,9 +247,6 @@ static int __init ifb_init_one(int index) | |||
| 258 | if (err < 0) | 247 | if (err < 0) |
| 259 | goto err; | 248 | goto err; |
| 260 | 249 | ||
| 261 | lockdep_set_class(&dev_ifb->queue_lock, &ifb_queue_lock_key); | ||
| 262 | lockdep_set_class(&dev_ifb->ingress_lock, &ifb_ingress_lock_key); | ||
| 263 | |||
| 264 | return 0; | 250 | return 0; |
| 265 | 251 | ||
| 266 | err: | 252 | err: |
