diff options
| author | David Miller <davem@davemloft.net> | 2015-04-05 22:19:09 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-07 15:29:08 -0400 |
| commit | 79b16aadea32cce077acbe9e229fcb58a7801687 (patch) | |
| tree | 8cfacda45a2b3d12a3831511199a13d33f245890 /net/ipv4/geneve.c | |
| parent | 7026b1ddb6b8d4e6ee33dc2bd06c0ca8746fa7ab (diff) | |
| download | op-kernel-dev-79b16aadea32cce077acbe9e229fcb58a7801687.zip op-kernel-dev-79b16aadea32cce077acbe9e229fcb58a7801687.tar.gz | |
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/ipv4/geneve.c')
| -rw-r--r-- | net/ipv4/geneve.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c index e64f8e9..b77f5e8 100644 --- a/net/ipv4/geneve.c +++ b/net/ipv4/geneve.c @@ -136,7 +136,7 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt, skb_set_inner_protocol(skb, htons(ETH_P_TEB)); - return udp_tunnel_xmit_skb(rt, skb, src, dst, + return udp_tunnel_xmit_skb(rt, gs->sock->sk, skb, src, dst, tos, ttl, df, src_port, dst_port, xnet, !csum); } |
