summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorJesse Gross <jesse@nicira.com>2015-01-29 01:32:46 +0100
committerDavid S. Miller <davem@davemloft.net>2015-01-29 08:04:15 +0100
commitb8693877ae016ac525d674d5d7a84ea0ea68ba60 (patch)
tree7ab9067c1c28bc829336a8d95736303f69d0bdea /net/ipv4
parentMerge tag 'nfc-next-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
downloadlinux-b8693877ae016ac525d674d5d7a84ea0ea68ba60.tar.xz
linux-b8693877ae016ac525d674d5d7a84ea0ea68ba60.zip
openvswitch: Add support for checksums on UDP tunnels.
Currently, it isn't possible to request checksums on the outer UDP header of tunnels - the TUNNEL_CSUM flag is ignored. This adds support for requesting that UDP checksums be computed on transmit and properly reported if they are present on receive. Signed-off-by: Jesse Gross <jesse@nicira.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/geneve.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c
index 93e51199e44b..5a4828ba05ad 100644
--- a/net/ipv4/geneve.c
+++ b/net/ipv4/geneve.c
@@ -107,13 +107,13 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt,
struct sk_buff *skb, __be32 src, __be32 dst, __u8 tos,
__u8 ttl, __be16 df, __be16 src_port, __be16 dst_port,
__be16 tun_flags, u8 vni[3], u8 opt_len, u8 *opt,
- bool xnet)
+ bool csum, bool xnet)
{
struct genevehdr *gnvh;
int min_headroom;
int err;
- skb = udp_tunnel_handle_offloads(skb, !gs->sock->sk->sk_no_check_tx);
+ skb = udp_tunnel_handle_offloads(skb, csum);
if (IS_ERR(skb))
return PTR_ERR(skb);
@@ -138,7 +138,7 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt,
return udp_tunnel_xmit_skb(rt, skb, src, dst,
tos, ttl, df, src_port, dst_port, xnet,
- gs->sock->sk->sk_no_check_tx);
+ !csum);
}
EXPORT_SYMBOL_GPL(geneve_xmit_skb);