diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 19:03:32 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 19:03:32 +0300 |
| commit | 189e7cc1e092a31183febe598f8e37385ff9936e (patch) | |
| tree | 9266d8e561d2c3c5ad0d069c1678474ff6fee3dc /drivers/net/bonding/bond_main.c | |
| parent | 09123d230a294cd3b860f4ea042235b988277f0a (diff) | |
| parent | 1f10bec3ef9d9d97999c72e19625432836820221 (diff) | |
| download | linux-189e7cc1e092a31183febe598f8e37385ff9936e.tar.xz | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
[PATCH] drivers cris: return on NULL dev_alloc_skb()
[PATCH] com20020 build fix
[PATCH] bonding: lockdep annotation
[PATCH] bcm43xx: Add error checking in bcm43xx_sprom_write()
[PATCH] bcm43xx: Drain TX status before starting IRQs
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -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; |