[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@xxxxxxxxxxx>
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Cc: Alexey Kuznetsov <kuznet@xxxxxxxxxxxxx>
Cc: James Morris <jmorris@xxxxxxxxx>
Cc: Hideaki YOSHIFUJI <yoshfuji@xxxxxxxxxxxxxx>
Cc: Patrick McHardy <kaber@xxxxxxxxx>
Cc: Ding Tianhong <dingtianhong@xxxxxxxxxx>
---


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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/