summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorTom Herbert <therbert@google.com>2015-01-05 13:56:14 -0800
committerDavid S. Miller <davem@davemloft.net>2015-01-05 22:44:46 -0500
commit224d019c4fbba242041e9b25a926ba873b7da1e2 (patch)
tree8597050c1dad2107ee9acf229dfdbb85c0edcb52 /net/ipv6
parent149118d89355fb0e1a898f47977f8ae9be8e14e7 (diff)
downloadop-kernel-dev-224d019c4fbba242041e9b25a926ba873b7da1e2.zip
op-kernel-dev-224d019c4fbba242041e9b25a926ba873b7da1e2.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 189dc4a..e41f017 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);
OpenPOWER on IntegriCloud