diff options
| author | David S. Miller <davem@davemloft.net> | 2015-04-07 15:29:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-07 15:29:30 -0400 |
| commit | e0e8db2f89bac4529fa12dde2595d6295e313952 (patch) | |
| tree | 8cfacda45a2b3d12a3831511199a13d33f245890 /net/ipv4/geneve.c | |
| parent | a3786a5ff7551d03029219f93306106d0a6bdf55 (diff) | |
| parent | 79b16aadea32cce077acbe9e229fcb58a7801687 (diff) | |
Merge branch 'udp_tunnel_sk'
Prevent UDP tunnels from operating on garbage socket
So this should do the rest of the work such that when we encapsulate
into a UDP tunnel, the output path works on the UDP tunnel's socket
rather than skb->sk.
Part of this work is based upon changes done by Jiri Pirko some time
ago.
Basically the first step is to pass the socket through the nf_hook
okfn(), and then next we do the same for the UDP tunnel xmit routines.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 e64f8e9785d1..b77f5e84c623 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); } |