diff options
| author |   Hannes Frederic Sowa <hannes@stressinduktion.org> | 2015-04-08 17:01:23 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-04-08 12:09:43 -0400 |
| commit | 1b112871186e3ab8333851c0caf203b47d7561b9 (patch) | |
| tree | 9af21550464d484f5ba35aaec57cc3b4ba303feb /net/ipv6/sit.c | |
| parent | ipv4: ip_tunnel: use net namespace from rtable not socket (diff) | |
| download | linux-dev-1b112871186e3ab8333851c0caf203b47d7561b9.tar.xz linux-dev-1b112871186e3ab8333851c0caf203b47d7561b9.zip | |
ipv6: call iptunnel_xmit with NULL sock pointer if no tunnel sock is available
Fixes: 79b16aadea32cce ("udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().")
Reported-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 6cf2026a9cea..ac35a28599be 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -983,7 +983,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, skb_set_inner_ipproto(skb, IPPROTO_IPV6); - err = iptunnel_xmit(skb->sk, rt, skb, fl4.saddr, fl4.daddr, + err = iptunnel_xmit(NULL, 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); |