diff options
author | Tom Herbert <therbert@google.com> | 2015-01-05 13:56:14 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-05 22:44:46 -0500 |
commit | 224d019c4fbba242041e9b25a926ba873b7da1e2 (patch) | |
tree | 8597050c1dad2107ee9acf229dfdbb85c0edcb52 /net/ipv6 | |
parent | 149118d89355fb0e1a898f47977f8ae9be8e14e7 (diff) | |
download | linux-224d019c4fbba242041e9b25a926ba873b7da1e2.tar.gz linux-224d019c4fbba242041e9b25a926ba873b7da1e2.tar.bz2 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/ipv6')
-rw-r--r-- | net/ipv6/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 189dc4ae3eca..e41f017cd479 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -909,7 +909,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, goto csum_error; } - if (udp_sk(sk)->convert_csum && uh->check && !IS_UDPLITE(sk)) + if (inet_get_convert_csum(sk) && uh->check && !IS_UDPLITE(sk)) skb_checksum_try_convert(skb, IPPROTO_UDP, uh->check, ip6_compute_pseudo); |