diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-02-27 20:12:23 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-02-27 20:12:23 -0500 |
| commit | 9f5a405b6843933c1cae5826046a5dd6357f142a (patch) | |
| tree | bcdbb0175d37b780551b71c40abcde964a8905eb /drivers/net/bonding/bond_main.c | |
| parent | b7cffb028abbffff3ba0b87268ecb775ed354049 (diff) | |
| parent | 051d3cbd96909b2fe6b5038e7bbe77f41356db05 (diff) | |
Merge branch 'from-linus'
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index e0f51afec778..bcf9f17daf0d 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -1581,6 +1581,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) | |||
| 1581 | printk(KERN_INFO DRV_NAME | 1581 | printk(KERN_INFO DRV_NAME |
| 1582 | ": %s: %s not enslaved\n", | 1582 | ": %s: %s not enslaved\n", |
| 1583 | bond_dev->name, slave_dev->name); | 1583 | bond_dev->name, slave_dev->name); |
| 1584 | write_unlock_bh(&bond->lock); | ||
| 1584 | return -EINVAL; | 1585 | return -EINVAL; |
| 1585 | } | 1586 | } |
| 1586 | 1587 | ||