1 files changed, 8 insertions, 9 deletions

diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index e77381d1df9a..fa5b7519765f 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -670,7 +670,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
                 return;
         }
 
-        err = iptunnel_xmit(rt, skb, fl4.saddr, fl4.daddr, protocol,
+        err = iptunnel_xmit(skb->sk, rt, skb, fl4.saddr, fl4.daddr, protocol,
                             tos, ttl, df, !net_eq(tunnel->net, dev_net(dev)));
         iptunnel_xmit_stats(err, &dev->stats, dev->tstats);
 
@@ -722,19 +722,18 @@ static void ip_tunnel_update(struct ip_tunnel_net *itn,
 int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd)
 {
         int err = 0;
-        struct ip_tunnel *t;
-        struct net *net = dev_net(dev);
-        struct ip_tunnel *tunnel = netdev_priv(dev);
-        struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id);
+        struct ip_tunnel *t = netdev_priv(dev);
+        struct net *net = t->net;
+        struct ip_tunnel_net *itn = net_generic(net, t->ip_tnl_net_id);
 
         BUG_ON(!itn->fb_tunnel_dev);
         switch (cmd) {
         case SIOCGETTUNNEL:
-                t = NULL;
-                if (dev == itn->fb_tunnel_dev)
+                if (dev == itn->fb_tunnel_dev) {
                         t = ip_tunnel_find(itn, p, itn->fb_tunnel_dev->type);
-                if (t == NULL)
-                        t = netdev_priv(dev);
+                        if (t == NULL)
+                                t = netdev_priv(dev);
+                }
                 memcpy(p, &t->parms, sizeof(*p));
                 break;