diff options
| author | David Miller <davem@davemloft.net> | 2015-04-06 02:19:09 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-07 19:29:08 (GMT) |
| commit | 79b16aadea32cce077acbe9e229fcb58a7801687 (patch) | |
| tree | 8cfacda45a2b3d12a3831511199a13d33f245890 /net/ipv6/ip6_gre.c | |
| parent | 7026b1ddb6b8d4e6ee33dc2bd06c0ca8746fa7ab (diff) | |
| download | linux-79b16aadea32cce077acbe9e229fcb58a7801687.tar.xz | |
udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().
That was we can make sure the output path of ipv4/ipv6 operate on
the UDP socket rather than whatever random thing happens to be in
skb->sk.
Based upon a patch by Jiri Pirko.
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Diffstat (limited to 'net/ipv6/ip6_gre.c')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index f724329..b5e6cc1 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -760,7 +760,7 @@ static netdev_tx_t ip6gre_xmit2(struct sk_buff *skb, skb_set_inner_protocol(skb, protocol); - ip6tunnel_xmit(skb, dev); + ip6tunnel_xmit(NULL, skb, dev); if (ndst) ip6_tnl_dst_store(tunnel, ndst); return 0; |