1 files changed, 18 insertions, 37 deletions

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index b4d74c86586c..6163f851dc01 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -101,19 +101,19 @@ static struct ip_tunnel *ipip6_tunnel_lookup(struct net *net,
         for_each_ip_tunnel_rcu(t, sitn->tunnels_r_l[h0 ^ h1]) {
                 if (local == t->parms.iph.saddr &&
                     remote == t->parms.iph.daddr &&
-                    (!dev || !t->parms.link || dev->iflink == t->parms.link) &&
+                    (!dev || !t->parms.link || dev->ifindex == t->parms.link) &&
                     (t->dev->flags & IFF_UP))
                         return t;
         }
         for_each_ip_tunnel_rcu(t, sitn->tunnels_r[h0]) {
                 if (remote == t->parms.iph.daddr &&
-                    (!dev || !t->parms.link || dev->iflink == t->parms.link) &&
+                    (!dev || !t->parms.link || dev->ifindex == t->parms.link) &&
                     (t->dev->flags & IFF_UP))
                         return t;
         }
         for_each_ip_tunnel_rcu(t, sitn->tunnels_l[h1]) {
                 if (local == t->parms.iph.saddr &&
-                    (!dev || !t->parms.link || dev->iflink == t->parms.link) &&
+                    (!dev || !t->parms.link || dev->ifindex == t->parms.link) &&
                     (t->dev->flags & IFF_UP))
                         return t;
         }
@@ -250,7 +250,8 @@ static struct ip_tunnel *ipip6_tunnel_locate(struct net *net,
         else
                 strcpy(name, "sit%d");
 
-        dev = alloc_netdev(sizeof(*t), name, ipip6_tunnel_setup);
+        dev = alloc_netdev(sizeof(*t), name, NET_NAME_UNKNOWN,
+                           ipip6_tunnel_setup);
         if (dev == NULL)
                 return NULL;
 
@@ -560,12 +561,12 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
 
         if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) {
                 ipv4_update_pmtu(skb, dev_net(skb->dev), info,
-                                 t->dev->ifindex, 0, IPPROTO_IPV6, 0);
+                                 t->parms.link, 0, IPPROTO_IPV6, 0);
                 err = 0;
                 goto out;
         }
         if (type == ICMP_REDIRECT) {
-                ipv4_redirect(skb, dev_net(skb->dev), t->dev->ifindex, 0,
+                ipv4_redirect(skb, dev_net(skb->dev), t->parms.link, 0,
                               IPPROTO_IPV6, 0);
                 err = 0;
                 goto out;
@@ -974,8 +975,9 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
                 goto out;
         }
 
-        err = iptunnel_xmit(rt, skb, fl4.saddr, fl4.daddr, IPPROTO_IPV6, tos,
-                            ttl, df, !net_eq(tunnel->net, dev_net(dev)));
+        err = iptunnel_xmit(skb->sk, rt, skb, fl4.saddr, fl4.daddr,
+                            IPPROTO_IPV6, tos, ttl, df,
+                            !net_eq(tunnel->net, dev_net(dev)));
         iptunnel_xmit_stats(err, &dev->stats, dev->tstats);
         return NETDEV_TX_OK;
 
@@ -1126,8 +1128,8 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
         int err = 0;
         struct ip_tunnel_parm p;
         struct ip_tunnel_prl prl;
-        struct ip_tunnel *t;
-        struct net *net = dev_net(dev);
+        struct ip_tunnel *t = netdev_priv(dev);
+        struct net *net = t->net;
         struct sit_net *sitn = net_generic(net, sit_net_id);
 #ifdef CONFIG_IPV6_SIT_6RD
         struct ip_tunnel_6rd ip6rd;
@@ -1138,16 +1140,15 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
 #ifdef CONFIG_IPV6_SIT_6RD
         case SIOCGET6RD:
 #endif
-                t = NULL;
                 if (dev == sitn->fb_tunnel_dev) {
                         if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof(p))) {
                                 err = -EFAULT;
                                 break;
                         }
                         t = ipip6_tunnel_locate(net, &p, 0);
+                        if (t == NULL)
+                                t = netdev_priv(dev);
                 }
-                if (t == NULL)
-                        t = netdev_priv(dev);
 
                 err = -EFAULT;
                 if (cmd == SIOCGETTUNNEL) {
@@ -1243,9 +1244,6 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
                 err = -EINVAL;
                 if (dev == sitn->fb_tunnel_dev)
                         goto done;
-                err = -ENOENT;
-                if (!(t = netdev_priv(dev)))
-                        goto done;
                 err = ipip6_tunnel_get_prl(t, ifr->ifr_ifru.ifru_data);
                 break;
 
@@ -1261,9 +1259,6 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
                 err = -EFAULT;
                 if (copy_from_user(&prl, ifr->ifr_ifru.ifru_data, sizeof(prl)))
                         goto done;
-                err = -ENOENT;
-                if (!(t = netdev_priv(dev)))
-                        goto done;
 
                 switch (cmd) {
                 case SIOCDELPRL:
@@ -1291,8 +1286,6 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
                                    sizeof(ip6rd)))
                         goto done;
 
-                t = netdev_priv(dev);
-
                 if (cmd != SIOCDEL6RD) {
                         err = ipip6_tunnel_update_6rd(t, &ip6rd);
                         if (err < 0)
@@ -1363,7 +1356,6 @@ static void ipip6_tunnel_setup(struct net_device *dev)
 static int ipip6_tunnel_init(struct net_device *dev)
 {
         struct ip_tunnel *tunnel = netdev_priv(dev);
-        int i;
 
         tunnel->dev = dev;
         tunnel->net = dev_net(dev);
@@ -1372,16 +1364,10 @@ static int ipip6_tunnel_init(struct net_device *dev)
         memcpy(dev->broadcast, &tunnel->parms.iph.daddr, 4);
 
         ipip6_tunnel_bind_dev(dev);
-        dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
+        dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
         if (!dev->tstats)
                 return -ENOMEM;
 
-        for_each_possible_cpu(i) {
-                struct pcpu_sw_netstats *ipip6_tunnel_stats;
-                ipip6_tunnel_stats = per_cpu_ptr(dev->tstats, i);
-                u64_stats_init(&ipip6_tunnel_stats->syncp);
-        }
-
         tunnel->dst_cache = alloc_percpu(struct ip_tunnel_dst);
         if (!tunnel->dst_cache) {
                 free_percpu(dev->tstats);
@@ -1397,7 +1383,6 @@ static int __net_init ipip6_fb_tunnel_init(struct net_device *dev)
         struct iphdr *iph = &tunnel->parms.iph;
         struct net *net = dev_net(dev);
         struct sit_net *sitn = net_generic(net, sit_net_id);
-        int i;
 
         tunnel->dev = dev;
         tunnel->net = dev_net(dev);
@@ -1408,16 +1393,10 @@ static int __net_init ipip6_fb_tunnel_init(struct net_device *dev)
         iph->ihl                = 5;
         iph->ttl                = 64;
 
-        dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
+        dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
         if (!dev->tstats)
                 return -ENOMEM;
 
-        for_each_possible_cpu(i) {
-                struct pcpu_sw_netstats *ipip6_fb_stats;
-                ipip6_fb_stats = per_cpu_ptr(dev->tstats, i);
-                u64_stats_init(&ipip6_fb_stats->syncp);
-        }
-
         tunnel->dst_cache = alloc_percpu(struct ip_tunnel_dst);
         if (!tunnel->dst_cache) {
                 free_percpu(dev->tstats);
@@ -1751,6 +1730,7 @@ static int __net_init sit_init_net(struct net *net)
         sitn->tunnels[3] = sitn->tunnels_r_l;
 
         sitn->fb_tunnel_dev = alloc_netdev(sizeof(struct ip_tunnel), "sit0",
+                                           NET_NAME_UNKNOWN,
                                            ipip6_tunnel_setup);
         if (!sitn->fb_tunnel_dev) {
                 err = -ENOMEM;
@@ -1850,4 +1830,5 @@ xfrm_tunnel_failed:
 module_init(sit_init);
 module_exit(sit_cleanup);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_RTNL_LINK("sit");
 MODULE_ALIAS_NETDEV("sit0");