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.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.c')
-rw-r--r-- | net/ipv4/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 13b4dcf86ef6..53358d88f110 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1806,7 +1806,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, if (sk != NULL) { int ret; - 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, inet_compute_pseudo); |