summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThadeu Lima de Souza Cascardo <cascardo@redhat.com>2016-04-01 17:17:50 -0300
committerDavid S. Miller <davem@davemloft.net>2016-04-05 19:48:51 -0400
commitb6ee376cb0b7fb4e7e07d6cd248bd40436fb9ba6 (patch)
treea2e7c6327ef48a75b07489e9fb67d4a7f3424710
parent727ceaa49bb86518470c19640ed7f067c5aa9485 (diff)
downloadlinux-stable-b6ee376cb0b7fb4e7e07d6cd248bd40436fb9ba6.tar.gz
linux-stable-b6ee376cb0b7fb4e7e07d6cd248bd40436fb9ba6.tar.bz2
linux-stable-b6ee376cb0b7fb4e7e07d6cd248bd40436fb9ba6.zip
ip6_tunnel: set rtnl_link_ops before calling register_netdevice
When creating an ip6tnl tunnel with ip tunnel, rtnl_link_ops is not set before ip6_tnl_create2 is called. When register_netdevice is called, there is no linkinfo attribute in the NEWLINK message because of that. Setting rtnl_link_ops before calling register_netdevice fixes that. Fixes: 0b112457229d ("ip6tnl: add support of link creation via rtnl") Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com> Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/ip6_tunnel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index eb2ac4bb09ce..1f20345cbc97 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -252,12 +252,12 @@ static int ip6_tnl_create2(struct net_device *dev)
t = netdev_priv(dev);
+ dev->rtnl_link_ops = &ip6_link_ops;
err = register_netdevice(dev);
if (err < 0)
goto out;
strcpy(t->parms.name, dev->name);
- dev->rtnl_link_ops = &ip6_link_ops;
dev_hold(dev);
ip6_tnl_link(ip6n, t);