diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter.h | 25 | ||||
| -rw-r--r-- | include/net/checksum.h | 25 |
2 files changed, 29 insertions, 21 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 25fc12260340..e2bf6d2ffb6c 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h | |||
| @@ -298,27 +298,10 @@ extern void nf_invalidate_cache(int pf); | |||
| 298 | Returns true or false. */ | 298 | Returns true or false. */ |
| 299 | extern int skb_make_writable(struct sk_buff *skb, unsigned int writable_len); | 299 | extern int skb_make_writable(struct sk_buff *skb, unsigned int writable_len); |
| 300 | 300 | ||
| 301 | static inline void nf_csum_replace4(__sum16 *sum, __be32 from, __be32 to) | 301 | #define nf_csum_replace4 csum_replace4 |
| 302 | { | 302 | #define nf_csum_replace2 csum_replace2 |
| 303 | __be32 diff[] = { ~from, to }; | 303 | #define nf_proto_csum_replace4 inet_proto_csum_replace4 |
| 304 | 304 | #define nf_proto_csum_replace2 inet_proto_csum_replace2 | |
| 305 | *sum = csum_fold(csum_partial((char *)diff, sizeof(diff), ~csum_unfold(*sum))); | ||
| 306 | } | ||
| 307 | |||
| 308 | static inline void nf_csum_replace2(__sum16 *sum, __be16 from, __be16 to) | ||
| 309 | { | ||
| 310 | nf_csum_replace4(sum, (__force __be32)from, (__force __be32)to); | ||
| 311 | } | ||
| 312 | |||
| 313 | extern void nf_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb, | ||
| 314 | __be32 from, __be32 to, int pseudohdr); | ||
| 315 | |||
| 316 | static inline void nf_proto_csum_replace2(__sum16 *sum, struct sk_buff *skb, | ||
| 317 | __be16 from, __be16 to, int pseudohdr) | ||
| 318 | { | ||
| 319 | nf_proto_csum_replace4(sum, skb, (__force __be32)from, | ||
| 320 | (__force __be32)to, pseudohdr); | ||
| 321 | } | ||
| 322 | 305 | ||
| 323 | struct nf_afinfo { | 306 | struct nf_afinfo { |
| 324 | unsigned short family; | 307 | unsigned short family; |
diff --git a/include/net/checksum.h b/include/net/checksum.h index 124246172a88..07602b7fa218 100644 --- a/include/net/checksum.h +++ b/include/net/checksum.h | |||
| @@ -93,4 +93,29 @@ static inline __wsum csum_unfold(__sum16 n) | |||
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | #define CSUM_MANGLED_0 ((__force __sum16)0xffff) | 95 | #define CSUM_MANGLED_0 ((__force __sum16)0xffff) |
| 96 | |||
| 97 | static inline void csum_replace4(__sum16 *sum, __be32 from, __be32 to) | ||
| 98 | { | ||
| 99 | __be32 diff[] = { ~from, to }; | ||
| 100 | |||
| 101 | *sum = csum_fold(csum_partial((char *)diff, sizeof(diff), ~csum_unfold(*sum))); | ||
| 102 | } | ||
| 103 | |||
| 104 | static inline void csum_replace2(__sum16 *sum, __be16 from, __be16 to) | ||
| 105 | { | ||
| 106 | csum_replace4(sum, (__force __be32)from, (__force __be32)to); | ||
| 107 | } | ||
| 108 | |||
| 109 | struct sk_buff; | ||
| 110 | extern void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb, | ||
| 111 | __be32 from, __be32 to, int pseudohdr); | ||
| 112 | |||
| 113 | static inline void inet_proto_csum_replace2(__sum16 *sum, struct sk_buff *skb, | ||
| 114 | __be16 from, __be16 to, | ||
| 115 | int pseudohdr) | ||
| 116 | { | ||
| 117 | inet_proto_csum_replace4(sum, skb, (__force __be32)from, | ||
| 118 | (__force __be32)to, pseudohdr); | ||
| 119 | } | ||
| 120 | |||
| 96 | #endif | 121 | #endif |