Patchwork [-next] bonding: fix error return code in bond_enslave()

login
register
mail settings
Submitter Wei Yongjun
Date Aug. 23, 2013, 2:45 a.m.
Message ID <CAPgLHd96k-qncCXzzVogwtmMdaYUDsMShdX52YSLAdbTiN1uEw@mail.gmail.com>
Download mbox | patch
Permalink /patch/269263/
State Accepted
Delegated to: David Miller
Headers show

Comments

Wei Yongjun - Aug. 23, 2013, 2:45 a.m.
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

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>
---
 drivers/net/bonding/bond_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Nikolay Aleksandrov - Aug. 23, 2013, 1:44 p.m.
On 08/23/2013 04:45 AM, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> 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>

Oops, missed the error code. Thanks :-)

Acked-by: Nikolay Aleksandrov <nikolay@redhat.com>


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Aug. 25, 2013, 10:38 p.m.
From: Nikolay Aleksandrov <nikolay@redhat.com>
Date: Fri, 23 Aug 2013 15:44:00 +0200

> On 08/23/2013 04:45 AM, Wei Yongjun wrote:
>> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>> 
>> 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>
> 
> Oops, missed the error code. Thanks :-)
> 
> Acked-by: Nikolay Aleksandrov <nikolay@redhat.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 4264a76..7407e65 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;