ip6_tunnel: Use ip6_tnl_dev_init as the ndo_init function.
authorSteffen Klassert <steffen.klassert@secunet.com>
Mon, 3 Nov 2014 08:19:27 +0000 (09:19 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Nov 2014 17:22:51 +0000 (09:22 -0800)
commit2d2a8385287335071789c88e4df4a516091472d5
tree37081c76b968aa55ffa8ab7ac801bfe24fa45e27
parentbe70188832b22a8f1a49d0e3a3eb2209f9cfdc8a
ip6_tunnel: Use ip6_tnl_dev_init as the ndo_init function.

[ Upstream commit 6c6151daaf2d8dc2046d9926539feed5f66bf74e ]

ip6_tnl_dev_init() sets the dev->iflink via a call to
ip6_tnl_link_config(). After that, register_netdevice()
sets dev->iflink = -1. So we loose the iflink configuration
for ipv6 tunnels. Fix this by using ip6_tnl_dev_init() as the
ndo_init function. Then ip6_tnl_dev_init() is called after
dev->iflink is set to -1 from register_netdevice().

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv6/ip6_tunnel.c