udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().

[deliverable/linux.git] / net / ipv6 / ip6_udp_tunnel.c

diff --git a/net/ipv6/ip6_udp_tunnel.c b/net/ipv6/ip6_udp_tunnel.c
index 32d9b268e7d85faa6b33a3fa1a3f3fff9a36cad8..bba8903e871fabd73c217efb6250eb743f7d66d8 100644 (file)
--- a/net/ipv6/ip6_udp_tunnel.c
+++ b/net/ipv6/ip6_udp_tunnel.c
@@ -62,7 +62,8 @@ error:
 }
 EXPORT_SYMBOL_GPL(udp_sock_create6);
 
-int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sk_buff *skb,
+int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,
+                        struct sk_buff *skb,
                         struct net_device *dev, struct in6_addr *saddr,
                         struct in6_addr *daddr,
                         __u8 prio, __u8 ttl, __be16 src_port,
@@ -97,7 +98,7 @@ int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sk_buff *skb,
        ip6h->daddr       = *daddr;
        ip6h->saddr       = *saddr;
 
-       ip6tunnel_xmit(skb, dev);
+       ip6tunnel_xmit(sk, skb, dev);
        return 0;
 }
 EXPORT_SYMBOL_GPL(udp_tunnel6_xmit_skb);