diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-11-06 22:01:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-06 22:01:18 -0500 |
| commit | 4e84b496fd2a226883920e0e0de4ed3f94898adf (patch) | |
| tree | 662e314870fabf5d6e3bf25b955bd537eb72de54 /net/ipv6/ip6_tunnel.c | |
| parent | vxlan: Fix to enable UDP checksums on interface (diff) | |
| parent | netxen: Fix link event handling. (diff) | |
| download | linux-dev-4e84b496fd2a226883920e0e0de4ed3f94898adf.tar.xz linux-dev-4e84b496fd2a226883920e0e0de4ed3f94898adf.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 4550d08f44de..e2b6cfba873c 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -289,9 +289,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) @@ -1526,6 +1523,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, @@ -1610,16 +1608,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; } |