aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_vti.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index c118f6b576bb..17cc0ffa8c0d 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -606,17 +606,10 @@ static int __net_init vti_fb_tunnel_init(struct net_device *dev)
606 struct iphdr *iph = &tunnel->parms.iph; 606 struct iphdr *iph = &tunnel->parms.iph;
607 struct vti_net *ipn = net_generic(dev_net(dev), vti_net_id); 607 struct vti_net *ipn = net_generic(dev_net(dev), vti_net_id);
608 608
609 tunnel->dev = dev;
610 strcpy(tunnel->parms.name, dev->name);
611
612 iph->version = 4; 609 iph->version = 4;
613 iph->protocol = IPPROTO_IPIP; 610 iph->protocol = IPPROTO_IPIP;
614 iph->ihl = 5; 611 iph->ihl = 5;
615 612
616 dev->tstats = alloc_percpu(struct pcpu_tstats);
617 if (!dev->tstats)
618 return -ENOMEM;
619
620 dev_hold(dev); 613 dev_hold(dev);
621 rcu_assign_pointer(ipn->tunnels_wc[0], tunnel); 614 rcu_assign_pointer(ipn->tunnels_wc[0], tunnel);
622 return 0; 615 return 0;