Skip to content

Commit

Permalink
ip6_tunnel: Use ip6_tnl_dev_init as the ndo_init function.
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
klassert authored and davem330 committed Nov 3, 2014
1 parent 3ce9b20 commit 6c6151d
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions net/ipv6/ip6_tunnel.c
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,6 @@ static int ip6_tnl_create2(struct net_device *dev)
int err;

t = netdev_priv(dev);
err = ip6_tnl_dev_init(dev);
if (err < 0)
goto out;

err = register_netdevice(dev);
if (err < 0)
Expand Down Expand Up @@ -1462,6 +1459,7 @@ ip6_tnl_change_mtu(struct net_device *dev, int new_mtu)


static const struct net_device_ops ip6_tnl_netdev_ops = {
.ndo_init = ip6_tnl_dev_init,
.ndo_uninit = ip6_tnl_dev_uninit,
.ndo_start_xmit = ip6_tnl_xmit,
.ndo_do_ioctl = ip6_tnl_ioctl,
Expand Down Expand Up @@ -1546,16 +1544,10 @@ static int __net_init ip6_fb_tnl_dev_init(struct net_device *dev)
struct ip6_tnl *t = netdev_priv(dev);
struct net *net = dev_net(dev);
struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
int err = ip6_tnl_dev_init_gen(dev);

if (err)
return err;

t->parms.proto = IPPROTO_IPV6;
dev_hold(dev);

ip6_tnl_link_config(t);

rcu_assign_pointer(ip6n->tnls_wc[0], t);
return 0;
}
Expand Down

0 comments on commit 6c6151d

Please sign in to comment.