* [PATCH -next] bonding: fix error return code in bond_enslave()
@ 2013-08-23 2:45 Wei Yongjun
2013-08-23 13:44 ` Nikolay Aleksandrov
0 siblings, 1 reply; 3+ messages in thread
From: Wei Yongjun @ 2013-08-23 2:45 UTC (permalink / raw)
To: fubar, andy, nikolay; +Cc: yongjun_wei, netdev
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(-)
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;
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH -next] bonding: fix error return code in bond_enslave()
2013-08-23 2:45 [PATCH -next] bonding: fix error return code in bond_enslave() Wei Yongjun
@ 2013-08-23 13:44 ` Nikolay Aleksandrov
2013-08-25 22:38 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Nikolay Aleksandrov @ 2013-08-23 13:44 UTC (permalink / raw)
To: Wei Yongjun; +Cc: fubar, andy, yongjun_wei, netdev
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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH -next] bonding: fix error return code in bond_enslave()
2013-08-23 13:44 ` Nikolay Aleksandrov
@ 2013-08-25 22:38 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2013-08-25 22:38 UTC (permalink / raw)
To: nikolay; +Cc: weiyj.lk, fubar, andy, yongjun_wei, netdev
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-08-25 22:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-23 2:45 [PATCH -next] bonding: fix error return code in bond_enslave() Wei Yongjun
2013-08-23 13:44 ` Nikolay Aleksandrov
2013-08-25 22:38 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).