diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2006-11-08 19:51:01 -0800 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-11-10 11:08:52 -0500 |
| commit | 0daa2303028a63dbd1b2e38f10854f0f7bf1ef9a (patch) | |
| tree | 46c78ad8ee7747f537b5e9ec371ab8706108340b /drivers/net | |
| parent | 088406bcf66d6c7fd8a5c04c00aa410ae9077403 (diff) | |
| download | linux-stable-0daa2303028a63dbd1b2e38f10854f0f7bf1ef9a.tar.gz linux-stable-0daa2303028a63dbd1b2e38f10854f0f7bf1ef9a.tar.bz2 linux-stable-0daa2303028a63dbd1b2e38f10854f0f7bf1ef9a.zip | |
[PATCH] bonding: lockdep annotation
=============================================
[ INFO: possible recursive locking detected ]
2.6.17-1.2600.fc6 #1
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index c0bbddae4ec4..17a461152d39 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -4692,6 +4692,8 @@ static int bond_check_params(struct bond_params *params) return 0; } +static struct lock_class_key bonding_netdev_xmit_lock_key; + /* Create a new bond based on the specified name and bonding parameters. * Caller must NOT hold rtnl_lock; we need to release it here before we * set up our sysfs entries. @@ -4727,6 +4729,9 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond if (res < 0) { goto out_bond; } + + lockdep_set_class(&bond_dev->_xmit_lock, &bonding_netdev_xmit_lock_key); + if (newbond) *newbond = bond_dev->priv; |