diff options
| author | Tom Herbert <therbert@google.com> | 2015-01-05 22:56:14 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-06 04:44:46 +0100 |
| commit | 224d019c4fbba242041e9b25a926ba873b7da1e2 (patch) | |
| tree | 8597050c1dad2107ee9acf229dfdbb85c0edcb52 /net/ipv4/udp_tunnel.c | |
| parent | netlink: Warn on unordered or illegal nla_nest_cancel() or nlmsg_cancel() (diff) | |
| download | linux-224d019c4fbba242041e9b25a926ba873b7da1e2.tar.xz linux-224d019c4fbba242041e9b25a926ba873b7da1e2.zip | |
ip: Move checksum convert defines to inet
Move convert_csum from udp_sock to inet_sock. This allows the
possibility that we can use convert checksum for different types
of sockets and also allows convert checksum to be enabled from
inet layer (what we'll want to do when enabling IP_CHECKSUM cmsg).
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udp_tunnel.c')
| -rw-r--r-- | net/ipv4/udp_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/udp_tunnel.c b/net/ipv4/udp_tunnel.c index 1671263e5fa0..9996e63ed304 100644 --- a/net/ipv4/udp_tunnel.c +++ b/net/ipv4/udp_tunnel.c @@ -63,7 +63,7 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock, inet_sk(sk)->mc_loop = 0; /* Enable CHECKSUM_UNNECESSARY to CHECKSUM_COMPLETE conversion */ - udp_set_convert_csum(sk, true); + inet_inc_convert_csum(sk); rcu_assign_sk_user_data(sk, cfg->sk_user_data); |