| Message ID | 1377123597-26515-1-git-send-email-vincent.stehle@laposte.net |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
I already reverted the change in question. -- 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
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) {
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(-)