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 /include/linux/udp.h | |
| parent | 149118d89355fb0e1a898f47977f8ae9be8e14e7 (diff) | |
| download | op-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 'include/linux/udp.h')
| -rw-r--r-- | include/linux/udp.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/linux/udp.h b/include/linux/udp.h index ee32775..247cfdc 100644 --- a/include/linux/udp.h +++ b/include/linux/udp.h @@ -49,11 +49,7 @@ struct udp_sock { unsigned int corkflag; /* Cork is required */ __u8 encap_type; /* Is this an Encapsulation socket? */ unsigned char no_check6_tx:1,/* Send zero UDP6 checksums on TX? */ - no_check6_rx:1,/* Allow zero UDP6 checksums on RX? */ - convert_csum:1;/* On receive, convert checksum - * unnecessary to checksum complete - * if possible. - */ + no_check6_rx:1;/* Allow zero UDP6 checksums on RX? */ /* * Following member retains the information to create a UDP header * when the socket is uncorked. @@ -102,16 +98,6 @@ static inline bool udp_get_no_check6_rx(struct sock *sk) return udp_sk(sk)->no_check6_rx; } -static inline void udp_set_convert_csum(struct sock *sk, bool val) -{ - udp_sk(sk)->convert_csum = val; -} - -static inline bool udp_get_convert_csum(struct sock *sk) -{ - return udp_sk(sk)->convert_csum; -} - #define udp_portaddr_for_each_entry(__sk, node, list) \ hlist_nulls_for_each_entry(__sk, node, list, __sk_common.skc_portaddr_node) |
