diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-25 10:15:46 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-25 10:15:46 +0300 |
| commit | 86b368b4b44ec8935f579189e7ab0c93c603642b (patch) | |
| tree | 81666ac4a5bb62098501eb04372a87a2d2643059 /net/ipv4/geneve.c | |
| parent | 2b995f63987013bacde99168218f9c7b252bdcf1 (diff) | |
| parent | af33c1adae1e095e90d14fe35501256ebb07aabf (diff) | |
| download | linux-86b368b4b44ec8935f579189e7ab0c93c603642b.tar.xz | |
Merge branch 'vxlan_tx'
Tom Herbert says:
====================
vxlan: Don't use UDP socket for transmit
UDP socket is not pertinent to transmit for UDP tunnels, checksum
enablement can be done without a socket. This patch set eliminates
reference to a socket in udp_tunnel_xmit functions and in VXLAN
transmit.
Also, make GBP, RCO, can CSUM6_RX flags visible to receive socket
and only match these for shareable socket.
v2: Fix geneve to call udp_tunnel_xmit with good arguments.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/geneve.c')
| -rw-r--r-- | net/ipv4/geneve.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c index 9568594ca2f1..93e51199e44b 100644 --- a/net/ipv4/geneve.c +++ b/net/ipv4/geneve.c @@ -136,8 +136,9 @@ 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(gs->sock, rt, skb, src, dst, - tos, ttl, df, src_port, dst_port, xnet); + return udp_tunnel_xmit_skb(rt, skb, src, dst, + tos, ttl, df, src_port, dst_port, xnet, + gs->sock->sk->sk_no_check_tx); } EXPORT_SYMBOL_GPL(geneve_xmit_skb); |