[PATCH linux-next] ipv6: fix missing braces in ip6_tnl_add_linklocal

[PATCH linux-next] ipv6: fix missing braces in ip6_tnl_add_linklocal

[Vincent Stehlé]

Braces have been removed by mistake by commit df8372c 'ipv6: fix checkpatch
errors in net/ipv6/addrconf.c'.

This fixes the following compilation warning:

  net/ipv6/addrconf.c: In function ‘addrconf_notify’:
  net/ipv6/addrconf.c:2793:22: warning: ‘link_dev’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  net/ipv6/addrconf.c:2802:21: note: ‘link_dev’ was declared here

Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net>
Cc: David S. Miller <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: James Morris <jmorris@namei.org>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Ding Tianhong <dingtianhong@huawei.com>
---


Hi,

This can be seen in e.g. Linux next-20130821.

Best regards,

V.


 net/ipv6/addrconf.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 980aa98..b2f2e6d 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2803,10 +2803,11 @@ static void ip6_tnl_add_linklocal(struct inet6_dev *idev)
 	struct net *net = dev_net(idev->dev);
 
 	/* first try to inherit the link-local address from the link device */
-	if (idev->dev->iflink)
+	if (idev->dev->iflink) {
 		link_dev = __dev_get_by_index(net, idev->dev->iflink);
 		if (link_dev && !ipv6_inherit_linklocal(idev, link_dev))
 			return;
+	}
 
 	/* then try to inherit it from any device */
 	for_each_netdev(net, link_dev) {
-- 
1.7.10.4

Re: [PATCH linux-next] ipv6: fix missing braces in ip6_tnl_add_linklocal

[David Miller]

I already reverted the change in question.