diff options
| author |   Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-08-23 10:45:07 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-08-25 18:37:35 -0400 |
| commit | b8e2fde466f7902fed4ad10bb60c1377b27cbfb7 (patch) | |
| tree | 97d05f5eb5b1ade53f561240a5860b52c929ea57 /drivers/net/bonding | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next (diff) | |
| download | linux-dev-b8e2fde466f7902fed4ad10bb60c1377b27cbfb7.tar.xz linux-dev-b8e2fde466f7902fed4ad10bb60c1377b27cbfb7.zip | |
bonding: fix error return code in bond_enslave()
Fix to return a negative error code in the add bond vlan ids error
handling case instead of 0, as done elsewhere in this function.
Introduced by commit 1ff412ad7714f6952f76ffd77f0a7f2f563288a1.
(bonding: change the bond's vlan syncing functions with the standard ones)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 4264a7631cba..7407e65f5d96 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1603,7 +1603,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) dev_mc_add(slave_dev, lacpdu_multicast); } - if (vlan_vids_add_by_dev(slave_dev, bond_dev)) { + res = vlan_vids_add_by_dev(slave_dev, bond_dev); + if (res) { pr_err("%s: Error: Couldn't add bond vlan ids to %s\n", bond_dev->name, slave_dev->name); goto err_close; |