aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/linux/crc32.h40
-rw-r--r--include/linux/skbuff.h13
-rw-r--r--include/net/checksum.h6
-rw-r--r--include/net/sctp/checksum.h56
-rw-r--r--lib/crc32.c453
-rw-r--r--net/core/skbuff.c31
-rw-r--r--net/sctp/output.c9
7 files changed, 350 insertions, 258 deletions
diff --git a/include/linux/crc32.h b/include/linux/crc32.h
index 68267b64bb98..7d275c4fc011 100644
--- a/include/linux/crc32.h
+++ b/include/linux/crc32.h
@@ -11,8 +11,48 @@
11extern u32 crc32_le(u32 crc, unsigned char const *p, size_t len); 11extern u32 crc32_le(u32 crc, unsigned char const *p, size_t len);
12extern u32 crc32_be(u32 crc, unsigned char const *p, size_t len); 12extern u32 crc32_be(u32 crc, unsigned char const *p, size_t len);
13 13
14/**
15 * crc32_le_combine - Combine two crc32 check values into one. For two
16 * sequences of bytes, seq1 and seq2 with lengths len1
17 * and len2, crc32_le() check values were calculated
18 * for each, crc1 and crc2.
19 *
20 * @crc1: crc32 of the first block
21 * @crc2: crc32 of the second block
22 * @len2: length of the second block
23 *
24 * Return: The crc32_le() check value of seq1 and seq2 concatenated,
25 * requiring only crc1, crc2, and len2. Note: If seq_full denotes
26 * the concatenated memory area of seq1 with seq2, and crc_full
27 * the crc32_le() value of seq_full, then crc_full ==
28 * crc32_le_combine(crc1, crc2, len2) when crc_full was seeded
29 * with the same initializer as crc1, and crc2 seed was 0. See
30 * also crc32_combine_test().
31 */
32extern u32 crc32_le_combine(u32 crc1, u32 crc2, size_t len2);
33
14extern u32 __crc32c_le(u32 crc, unsigned char const *p, size_t len); 34extern u32 __crc32c_le(u32 crc, unsigned char const *p, size_t len);
15 35
36/**
37 * __crc32c_le_combine - Combine two crc32c check values into one. For two
38 * sequences of bytes, seq1 and seq2 with lengths len1
39 * and len2, __crc32c_le() check values were calculated
40 * for each, crc1 and crc2.
41 *
42 * @crc1: crc32c of the first block
43 * @crc2: crc32c of the second block
44 * @len2: length of the second block
45 *
46 * Return: The __crc32c_le() check value of seq1 and seq2 concatenated,
47 * requiring only crc1, crc2, and len2. Note: If seq_full denotes
48 * the concatenated memory area of seq1 with seq2, and crc_full
49 * the __crc32c_le() value of seq_full, then crc_full ==
50 * __crc32c_le_combine(crc1, crc2, len2) when crc_full was
51 * seeded with the same initializer as crc1, and crc2 seed
52 * was 0. See also crc32c_combine_test().
53 */
54extern u32 __crc32c_le_combine(u32 crc1, u32 crc2, size_t len2);
55
16#define crc32(seed, data, length) crc32_le(seed, (unsigned char const *)(data), length) 56#define crc32(seed, data, length) crc32_le(seed, (unsigned char const *)(data), length)
17 57
18/* 58/*
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 2c154976394b..44727b5d4981 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2360,8 +2360,6 @@ int skb_copy_datagram_const_iovec(const struct sk_buff *from, int offset,
2360void skb_free_datagram(struct sock *sk, struct sk_buff *skb); 2360void skb_free_datagram(struct sock *sk, struct sk_buff *skb);
2361void skb_free_datagram_locked(struct sock *sk, struct sk_buff *skb); 2361void skb_free_datagram_locked(struct sock *sk, struct sk_buff *skb);
2362int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags); 2362int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags);
2363__wsum skb_checksum(const struct sk_buff *skb, int offset, int len,
2364 __wsum csum);
2365int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len); 2363int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len);
2366int skb_store_bits(struct sk_buff *skb, int offset, const void *from, int len); 2364int skb_store_bits(struct sk_buff *skb, int offset, const void *from, int len);
2367__wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset, u8 *to, 2365__wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset, u8 *to,
@@ -2373,9 +2371,18 @@ void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to);
2373void skb_split(struct sk_buff *skb, struct sk_buff *skb1, const u32 len); 2371void skb_split(struct sk_buff *skb, struct sk_buff *skb1, const u32 len);
2374int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen); 2372int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen);
2375void skb_scrub_packet(struct sk_buff *skb, bool xnet); 2373void skb_scrub_packet(struct sk_buff *skb, bool xnet);
2376
2377struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features); 2374struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features);
2378 2375
2376struct skb_checksum_ops {
2377 __wsum (*update)(const void *mem, int len, __wsum wsum);
2378 __wsum (*combine)(__wsum csum, __wsum csum2, int offset, int len);
2379};
2380
2381__wsum __skb_checksum(const struct sk_buff *skb, int offset, int len,
2382 __wsum csum, const struct skb_checksum_ops *ops);
2383__wsum skb_checksum(const struct sk_buff *skb, int offset, int len,
2384 __wsum csum);
2385
2379static inline void *skb_header_pointer(const struct sk_buff *skb, int offset, 2386static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
2380 int len, void *buffer) 2387 int len, void *buffer)
2381{ 2388{
diff --git a/include/net/checksum.h b/include/net/checksum.h
index 8f59ca50477c..15f33fde826e 100644
--- a/include/net/checksum.h
+++ b/include/net/checksum.h
@@ -79,6 +79,12 @@ csum_block_add(__wsum csum, __wsum csum2, int offset)
79} 79}
80 80
81static inline __wsum 81static inline __wsum
82csum_block_add_ext(__wsum csum, __wsum csum2, int offset, int len)
83{
84 return csum_block_add(csum, csum2, offset);
85}
86
87static inline __wsum
82csum_block_sub(__wsum csum, __wsum csum2, int offset) 88csum_block_sub(__wsum csum, __wsum csum2, int offset)
83{ 89{
84 u32 sum = (__force u32)csum2; 90 u32 sum = (__force u32)csum2;
diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
index 259924d63ba6..6bd44fe94c26 100644
--- a/include/net/sctp/checksum.h
+++ b/include/net/sctp/checksum.h
@@ -42,56 +42,38 @@
42#include <linux/types.h> 42#include <linux/types.h>
43#include <net/sctp/sctp.h> 43#include <net/sctp/sctp.h>
44#include <linux/crc32c.h> 44#include <linux/crc32c.h>
45#include <linux/crc32.h>
45 46
46static inline __u32 sctp_crc32c(__u32 crc, u8 *buffer, u16 length) 47static inline __wsum sctp_csum_update(const void *buff, int len, __wsum sum)
47{ 48{
48 return crc32c(crc, buffer, length); 49 /* This uses the crypto implementation of crc32c, which is either
49} 50 * implemented w/ hardware support or resolves to __crc32c_le().
50
51static inline __u32 sctp_start_cksum(__u8 *buffer, __u16 length)
52{
53 __u32 crc = ~(__u32)0;
54 __u8 zero[sizeof(__u32)] = {0};
55
56 /* Optimize this routine to be SCTP specific, knowing how
57 * to skip the checksum field of the SCTP header.
58 */ 51 */
59 52 return crc32c(sum, buff, len);
60 /* Calculate CRC up to the checksum. */
61 crc = sctp_crc32c(crc, buffer, sizeof(struct sctphdr) - sizeof(__u32));
62
63 /* Skip checksum field of the header. */
64 crc = sctp_crc32c(crc, zero, sizeof(__u32));
65
66 /* Calculate the rest of the CRC. */
67 crc = sctp_crc32c(crc, &buffer[sizeof(struct sctphdr)],
68 length - sizeof(struct sctphdr));
69 return crc;
70}
71
72static inline __u32 sctp_update_cksum(__u8 *buffer, __u16 length, __u32 crc32)
73{
74 return sctp_crc32c(crc32, buffer, length);
75} 53}
76 54
77static inline __le32 sctp_end_cksum(__u32 crc32) 55static inline __wsum sctp_csum_combine(__wsum csum, __wsum csum2,
56 int offset, int len)
78{ 57{
79 return cpu_to_le32(~crc32); 58 return __crc32c_le_combine(csum, csum2, len);
80} 59}
81 60
82/* Calculate the CRC32C checksum of an SCTP packet. */
83static inline __le32 sctp_compute_cksum(const struct sk_buff *skb, 61static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
84 unsigned int offset) 62 unsigned int offset)
85{ 63{
86 const struct sk_buff *iter; 64 struct sctphdr *sh = sctp_hdr(skb);
65 __le32 ret, old = sh->checksum;
66 const struct skb_checksum_ops ops = {
67 .update = sctp_csum_update,
68 .combine = sctp_csum_combine,
69 };
87 70
88 __u32 crc32 = sctp_start_cksum(skb->data + offset, 71 sh->checksum = 0;
89 skb_headlen(skb) - offset); 72 ret = cpu_to_le32(~__skb_checksum(skb, offset, skb->len - offset,
90 skb_walk_frags(skb, iter) 73 ~(__u32)0, &ops));
91 crc32 = sctp_update_cksum((__u8 *) iter->data, 74 sh->checksum = old;
92 skb_headlen(iter), crc32);
93 75
94 return sctp_end_cksum(crc32); 76 return ret;
95} 77}
96 78
97#endif /* __sctp_checksum_h__ */ 79#endif /* __sctp_checksum_h__ */
diff --git a/lib/crc32.c b/lib/crc32.c
index 410093dbe51c..69dd124f0cfc 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -49,6 +49,30 @@ MODULE_AUTHOR("Matt Domsch <Matt_Domsch@dell.com>");
49MODULE_DESCRIPTION("Various CRC32 calculations"); 49MODULE_DESCRIPTION("Various CRC32 calculations");
50MODULE_LICENSE("GPL"); 50MODULE_LICENSE("GPL");
51 51
52#define GF2_DIM 32
53
54static u32 gf2_matrix_times(u32 *mat, u32 vec)
55{
56 u32 sum = 0;
57
58 while (vec) {
59 if (vec & 1)
60 sum ^= *mat;
61 vec >>= 1;
62 mat++;
63 }
64
65 return sum;
66}
67
68static void gf2_matrix_square(u32 *square, u32 *mat)
69{
70 int i;
71
72 for (i = 0; i < GF2_DIM; i++)
73 square[i] = gf2_matrix_times(mat, mat[i]);
74}
75
52#if CRC_LE_BITS > 8 || CRC_BE_BITS > 8 76#if CRC_LE_BITS > 8 || CRC_BE_BITS > 8
53 77
54/* implements slicing-by-4 or slicing-by-8 algorithm */ 78/* implements slicing-by-4 or slicing-by-8 algorithm */
@@ -130,6 +154,52 @@ crc32_body(u32 crc, unsigned char const *buf, size_t len, const u32 (*tab)[256])
130} 154}
131#endif 155#endif
132 156
157/* For conditions of distribution and use, see copyright notice in zlib.h */
158static u32 crc32_generic_combine(u32 crc1, u32 crc2, size_t len2,
159 u32 polynomial)
160{
161 u32 even[GF2_DIM]; /* Even-power-of-two zeros operator */
162 u32 odd[GF2_DIM]; /* Odd-power-of-two zeros operator */
163 u32 row;
164 int i;
165
166 if (len2 <= 0)
167 return crc1;
168
169 /* Put operator for one zero bit in odd */
170 odd[0] = polynomial;
171 row = 1;
172 for (i = 1; i < GF2_DIM; i++) {
173 odd[i] = row;
174 row <<= 1;
175 }
176
177 gf2_matrix_square(even, odd); /* Put operator for two zero bits in even */
178 gf2_matrix_square(odd, even); /* Put operator for four zero bits in odd */
179
180 /* Apply len2 zeros to crc1 (first square will put the operator for one
181 * zero byte, eight zero bits, in even).
182 */
183 do {
184 /* Apply zeros operator for this bit of len2 */
185 gf2_matrix_square(even, odd);
186 if (len2 & 1)
187 crc1 = gf2_matrix_times(even, crc1);
188 len2 >>= 1;
189 /* If no more bits set, then done */
190 if (len2 == 0)
191 break;
192 /* Another iteration of the loop with odd and even swapped */
193 gf2_matrix_square(odd, even);
194 if (len2 & 1)
195 crc1 = gf2_matrix_times(odd, crc1);
196 len2 >>= 1;
197 } while (len2 != 0);
198
199 crc1 ^= crc2;
200 return crc1;
201}
202
133/** 203/**
134 * crc32_le_generic() - Calculate bitwise little-endian Ethernet AUTODIN II 204 * crc32_le_generic() - Calculate bitwise little-endian Ethernet AUTODIN II
135 * CRC32/CRC32C 205 * CRC32/CRC32C
@@ -200,8 +270,19 @@ u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len)
200 (const u32 (*)[256])crc32ctable_le, CRC32C_POLY_LE); 270 (const u32 (*)[256])crc32ctable_le, CRC32C_POLY_LE);
201} 271}
202#endif 272#endif
273u32 __pure crc32_le_combine(u32 crc1, u32 crc2, size_t len2)
274{
275 return crc32_generic_combine(crc1, crc2, len2, CRCPOLY_LE);
276}
277
278u32 __pure __crc32c_le_combine(u32 crc1, u32 crc2, size_t len2)
279{
280 return crc32_generic_combine(crc1, crc2, len2, CRC32C_POLY_LE);
281}
203EXPORT_SYMBOL(crc32_le); 282EXPORT_SYMBOL(crc32_le);
283EXPORT_SYMBOL(crc32_le_combine);
204EXPORT_SYMBOL(__crc32c_le); 284EXPORT_SYMBOL(__crc32c_le);
285EXPORT_SYMBOL(__crc32c_le_combine);
205 286
206/** 287/**
207 * crc32_be_generic() - Calculate bitwise big-endian Ethernet AUTODIN II CRC32 288 * crc32_be_generic() - Calculate bitwise big-endian Ethernet AUTODIN II CRC32
@@ -795,206 +876,106 @@ static struct crc_test {
795 u32 crc32c_le; /* expected crc32c_le result */ 876 u32 crc32c_le; /* expected crc32c_le result */
796} test[] = 877} test[] =
797{ 878{
798 {0x674bf11d, 0x00000038, 0x00000542, 0x0af6d466, 0xd8b6e4c1, 879 {0x674bf11d, 0x00000038, 0x00000542, 0x0af6d466, 0xd8b6e4c1, 0xf6e93d6c},
799 0xf6e93d6c}, 880 {0x35c672c6, 0x0000003a, 0x000001aa, 0xc6d3dfba, 0x28aaf3ad, 0x0fe92aca},
800 {0x35c672c6, 0x0000003a, 0x000001aa, 0xc6d3dfba, 0x28aaf3ad, 881 {0x496da28e, 0x00000039, 0x000005af, 0xd933660f, 0x5d57e81f, 0x52e1ebb8},
801 0x0fe92aca}, 882 {0x09a9b90e, 0x00000027, 0x000001f8, 0xb45fe007, 0xf45fca9a, 0x0798af9a},
802 {0x496da28e, 0x00000039, 0x000005af, 0xd933660f, 0x5d57e81f, 883 {0xdc97e5a9, 0x00000025, 0x000003b6, 0xf81a3562, 0xe0126ba2, 0x18eb3152},
803 0x52e1ebb8}, 884 {0x47c58900, 0x0000000a, 0x000000b9, 0x8e58eccf, 0xf3afc793, 0xd00d08c7},
804 {0x09a9b90e, 0x00000027, 0x000001f8, 0xb45fe007, 0xf45fca9a, 885 {0x292561e8, 0x0000000c, 0x00000403, 0xa2ba8aaf, 0x0b797aed, 0x8ba966bc},
805 0x0798af9a}, 886 {0x415037f6, 0x00000003, 0x00000676, 0xa17d52e8, 0x7f0fdf35, 0x11d694a2},
806 {0xdc97e5a9, 0x00000025, 0x000003b6, 0xf81a3562, 0xe0126ba2, 887 {0x3466e707, 0x00000026, 0x00000042, 0x258319be, 0x75c484a2, 0x6ab3208d},
807 0x18eb3152}, 888 {0xafd1281b, 0x00000023, 0x000002ee, 0x4428eaf8, 0x06c7ad10, 0xba4603c5},
808 {0x47c58900, 0x0000000a, 0x000000b9, 0x8e58eccf, 0xf3afc793, 889 {0xd3857b18, 0x00000028, 0x000004a2, 0x5c430821, 0xb062b7cb, 0xe6071c6f},
809 0xd00d08c7}, 890 {0x1d825a8f, 0x0000002b, 0x0000050b, 0xd2c45f0c, 0xd68634e0, 0x179ec30a},
810 {0x292561e8, 0x0000000c, 0x00000403, 0xa2ba8aaf, 0x0b797aed, 891 {0x5033e3bc, 0x0000000b, 0x00000078, 0xa3ea4113, 0xac6d31fb, 0x0903beb8},
811 0x8ba966bc}, 892 {0x94f1fb5e, 0x0000000f, 0x000003a2, 0xfbfc50b1, 0x3cfe50ed, 0x6a7cb4fa},
812 {0x415037f6, 0x00000003, 0x00000676, 0xa17d52e8, 0x7f0fdf35, 893 {0xc9a0fe14, 0x00000009, 0x00000473, 0x5fb61894, 0x87070591, 0xdb535801},
813 0x11d694a2}, 894 {0x88a034b1, 0x0000001c, 0x000005ad, 0xc1b16053, 0x46f95c67, 0x92bed597},
814 {0x3466e707, 0x00000026, 0x00000042, 0x258319be, 0x75c484a2, 895 {0xf0f72239, 0x00000020, 0x0000026d, 0xa6fa58f3, 0xf8c2c1dd, 0x192a3f1b},
815 0x6ab3208d}, 896 {0xcc20a5e3, 0x0000003b, 0x0000067a, 0x7740185a, 0x308b979a, 0xccbaec1a},
816 {0xafd1281b, 0x00000023, 0x000002ee, 0x4428eaf8, 0x06c7ad10, 897 {0xce589c95, 0x0000002b, 0x00000641, 0xd055e987, 0x40aae25b, 0x7eabae4d},
817 0xba4603c5}, 898 {0x78edc885, 0x00000035, 0x000005be, 0xa39cb14b, 0x035b0d1f, 0x28c72982},
818 {0xd3857b18, 0x00000028, 0x000004a2, 0x5c430821, 0xb062b7cb, 899 {0x9d40a377, 0x0000003b, 0x00000038, 0x1f47ccd2, 0x197fbc9d, 0xc3cd4d18},
819 0xe6071c6f}, 900 {0x703d0e01, 0x0000003c, 0x000006f1, 0x88735e7c, 0xfed57c5a, 0xbca8f0e7},
820 {0x1d825a8f, 0x0000002b, 0x0000050b, 0xd2c45f0c, 0xd68634e0, 901 {0x776bf505, 0x0000000f, 0x000005b2, 0x5cc4fc01, 0xf32efb97, 0x713f60b3},
821 0x179ec30a}, 902 {0x4a3e7854, 0x00000027, 0x000004b8, 0x8d923c82, 0x0cbfb4a2, 0xebd08fd5},
822 {0x5033e3bc, 0x0000000b, 0x00000078, 0xa3ea4113, 0xac6d31fb, 903 {0x209172dd, 0x0000003b, 0x00000356, 0xb89e9c2b, 0xd7868138, 0x64406c59},
823 0x0903beb8}, 904 {0x3ba4cc5b, 0x0000002f, 0x00000203, 0xe51601a9, 0x5b2a1032, 0x7421890e},
824 {0x94f1fb5e, 0x0000000f, 0x000003a2, 0xfbfc50b1, 0x3cfe50ed, 905 {0xfc62f297, 0x00000000, 0x00000079, 0x71a8e1a2, 0x5d88685f, 0xe9347603},
825 0x6a7cb4fa}, 906 {0x64280b8b, 0x00000016, 0x000007ab, 0x0fa7a30c, 0xda3a455f, 0x1bef9060},
826 {0xc9a0fe14, 0x00000009, 0x00000473, 0x5fb61894, 0x87070591, 907 {0x97dd724b, 0x00000033, 0x000007ad, 0x5788b2f4, 0xd7326d32, 0x34720072},
827 0xdb535801}, 908 {0x61394b52, 0x00000035, 0x00000571, 0xc66525f1, 0xcabe7fef, 0x48310f59},
828 {0x88a034b1, 0x0000001c, 0x000005ad, 0xc1b16053, 0x46f95c67, 909 {0x29b4faff, 0x00000024, 0x0000006e, 0xca13751e, 0x993648e0, 0x783a4213},
829 0x92bed597}, 910 {0x29bfb1dc, 0x0000000b, 0x00000244, 0x436c43f7, 0x429f7a59, 0x9e8efd41},
830 {0xf0f72239, 0x00000020, 0x0000026d, 0xa6fa58f3, 0xf8c2c1dd, 911 {0x86ae934b, 0x00000035, 0x00000104, 0x0760ec93, 0x9cf7d0f4, 0xfc3d34a5},
831 0x192a3f1b}, 912 {0xc4c1024e, 0x0000002e, 0x000006b1, 0x6516a3ec, 0x19321f9c, 0x17a52ae2},
832 {0xcc20a5e3, 0x0000003b, 0x0000067a, 0x7740185a, 0x308b979a, 913 {0x3287a80a, 0x00000026, 0x00000496, 0x0b257eb1, 0x754ebd51, 0x886d935a},
833 0xccbaec1a}, 914 {0xa4db423e, 0x00000023, 0x0000045d, 0x9b3a66dc, 0x873e9f11, 0xeaaeaeb2},
834 {0xce589c95, 0x0000002b, 0x00000641, 0xd055e987, 0x40aae25b, 915 {0x7a1078df, 0x00000015, 0x0000014a, 0x8c2484c5, 0x6a628659, 0x8e900a4b},
835 0x7eabae4d}, 916 {0x6048bd5b, 0x00000006, 0x0000006a, 0x897e3559, 0xac9961af, 0xd74662b1},
836 {0x78edc885, 0x00000035, 0x000005be, 0xa39cb14b, 0x035b0d1f, 917 {0xd8f9ea20, 0x0000003d, 0x00000277, 0x60eb905b, 0xed2aaf99, 0xd26752ba},
837 0x28c72982}, 918 {0xea5ec3b4, 0x0000002a, 0x000004fe, 0x869965dc, 0x6c1f833b, 0x8b1fcd62},
838 {0x9d40a377, 0x0000003b, 0x00000038, 0x1f47ccd2, 0x197fbc9d, 919 {0x2dfb005d, 0x00000016, 0x00000345, 0x6a3b117e, 0xf05e8521, 0xf54342fe},
839 0xc3cd4d18}, 920 {0x5a214ade, 0x00000020, 0x000005b6, 0x467f70be, 0xcb22ccd3, 0x5b95b988},
840 {0x703d0e01, 0x0000003c, 0x000006f1, 0x88735e7c, 0xfed57c5a, 921 {0xf0ab9cca, 0x00000032, 0x00000515, 0xed223df3, 0x7f3ef01d, 0x2e1176be},
841 0xbca8f0e7}, 922 {0x91b444f9, 0x0000002e, 0x000007f8, 0x84e9a983, 0x5676756f, 0x66120546},
842 {0x776bf505, 0x0000000f, 0x000005b2, 0x5cc4fc01, 0xf32efb97, 923 {0x1b5d2ddb, 0x0000002e, 0x0000012c, 0xba638c4c, 0x3f42047b, 0xf256a5cc},
843 0x713f60b3}, 924 {0xd824d1bb, 0x0000003a, 0x000007b5, 0x6288653b, 0x3a3ebea0, 0x4af1dd69},
844 {0x4a3e7854, 0x00000027, 0x000004b8, 0x8d923c82, 0x0cbfb4a2, 925 {0x0470180c, 0x00000034, 0x000001f0, 0x9d5b80d6, 0x3de08195, 0x56f0a04a},
845 0xebd08fd5}, 926 {0xffaa3a3f, 0x00000036, 0x00000299, 0xf3a82ab8, 0x53e0c13d, 0x74f6b6b2},
846 {0x209172dd, 0x0000003b, 0x00000356, 0xb89e9c2b, 0xd7868138, 927 {0x6406cfeb, 0x00000023, 0x00000600, 0xa920b8e8, 0xe4e2acf4, 0x085951fd},
847 0x64406c59}, 928 {0xb24aaa38, 0x0000003e, 0x000004a1, 0x657cc328, 0x5077b2c3, 0xc65387eb},
848 {0x3ba4cc5b, 0x0000002f, 0x00000203, 0xe51601a9, 0x5b2a1032, 929 {0x58b2ab7c, 0x00000039, 0x000002b4, 0x3a17ee7e, 0x9dcb3643, 0x1ca9257b},
849 0x7421890e}, 930 {0x3db85970, 0x00000006, 0x000002b6, 0x95268b59, 0xb9812c10, 0xfd196d76},
850 {0xfc62f297, 0x00000000, 0x00000079, 0x71a8e1a2, 0x5d88685f, 931 {0x857830c5, 0x00000003, 0x00000590, 0x4ef439d5, 0xf042161d, 0x5ef88339},
851 0xe9347603}, 932 {0xe1fcd978, 0x0000003e, 0x000007d8, 0xae8d8699, 0xce0a1ef5, 0x2c3714d9},
852 {0x64280b8b, 0x00000016, 0x000007ab, 0x0fa7a30c, 0xda3a455f, 933 {0xb982a768, 0x00000016, 0x000006e0, 0x62fad3df, 0x5f8a067b, 0x58576548},
853 0x1bef9060}, 934 {0x1d581ce8, 0x0000001e, 0x0000058b, 0xf0f5da53, 0x26e39eee, 0xfd7c57de},
854 {0x97dd724b, 0x00000033, 0x000007ad, 0x5788b2f4, 0xd7326d32, 935 {0x2456719b, 0x00000025, 0x00000503, 0x4296ac64, 0xd50e4c14, 0xd5fedd59},
855 0x34720072}, 936 {0xfae6d8f2, 0x00000000, 0x0000055d, 0x057fdf2e, 0x2a31391a, 0x1cc3b17b},
856 {0x61394b52, 0x00000035, 0x00000571, 0xc66525f1, 0xcabe7fef, 937 {0xcba828e3, 0x00000039, 0x000002ce, 0xe3f22351, 0x8f00877b, 0x270eed73},
857 0x48310f59}, 938 {0x13d25952, 0x0000000a, 0x0000072d, 0x76d4b4cc, 0x5eb67ec3, 0x91ecbb11},
858 {0x29b4faff, 0x00000024, 0x0000006e, 0xca13751e, 0x993648e0, 939 {0x0342be3f, 0x00000015, 0x00000599, 0xec75d9f1, 0x9d4d2826, 0x05ed8d0c},
859 0x783a4213}, 940 {0xeaa344e0, 0x00000014, 0x000004d8, 0x72a4c981, 0x2064ea06, 0x0b09ad5b},
860 {0x29bfb1dc, 0x0000000b, 0x00000244, 0x436c43f7, 0x429f7a59, 941 {0xbbb52021, 0x0000003b, 0x00000272, 0x04af99fc, 0xaf042d35, 0xf8d511fb},
861 0x9e8efd41}, 942 {0xb66384dc, 0x0000001d, 0x000007fc, 0xd7629116, 0x782bd801, 0x5ad832cc},
862 {0x86ae934b, 0x00000035, 0x00000104, 0x0760ec93, 0x9cf7d0f4, 943 {0x616c01b6, 0x00000022, 0x000002c8, 0x5b1dab30, 0x783ce7d2, 0x1214d196},
863 0xfc3d34a5}, 944 {0xce2bdaad, 0x00000016, 0x0000062a, 0x932535c8, 0x3f02926d, 0x5747218a},
864 {0xc4c1024e, 0x0000002e, 0x000006b1, 0x6516a3ec, 0x19321f9c, 945 {0x00fe84d7, 0x00000005, 0x00000205, 0x850e50aa, 0x753d649c, 0xde8f14de},
865 0x17a52ae2}, 946 {0xbebdcb4c, 0x00000006, 0x0000055d, 0xbeaa37a2, 0x2d8c9eba, 0x3563b7b9},
866 {0x3287a80a, 0x00000026, 0x00000496, 0x0b257eb1, 0x754ebd51, 947 {0xd8b1a02a, 0x00000010, 0x00000387, 0x5017d2fc, 0x503541a5, 0x071475d0},
867 0x886d935a}, 948 {0x3b96cad2, 0x00000036, 0x00000347, 0x1d2372ae, 0x926cd90b, 0x54c79d60},
868 {0xa4db423e, 0x00000023, 0x0000045d, 0x9b3a66dc, 0x873e9f11, 949 {0xc94c1ed7, 0x00000005, 0x0000038b, 0x9e9fdb22, 0x144a9178, 0x4c53eee6},
869 0xeaaeaeb2}, 950 {0x1aad454e, 0x00000025, 0x000002b2, 0xc3f6315c, 0x5c7a35b3, 0x10137a3c},
870 {0x7a1078df, 0x00000015, 0x0000014a, 0x8c2484c5, 0x6a628659, 951 {0xa4fec9a6, 0x00000000, 0x000006d6, 0x90be5080, 0xa4107605, 0xaa9d6c73},
871 0x8e900a4b}, 952 {0x1bbe71e2, 0x0000001f, 0x000002fd, 0x4e504c3b, 0x284ccaf1, 0xb63d23e7},
872 {0x6048bd5b, 0x00000006, 0x0000006a, 0x897e3559, 0xac9961af, 953 {0x4201c7e4, 0x00000002, 0x000002b7, 0x7822e3f9, 0x0cc912a9, 0x7f53e9cf},
873 0xd74662b1}, 954 {0x23fddc96, 0x00000003, 0x00000627, 0x8a385125, 0x07767e78, 0x13c1cd83},
874 {0xd8f9ea20, 0x0000003d, 0x00000277, 0x60eb905b, 0xed2aaf99, 955 {0xd82ba25c, 0x00000016, 0x0000063e, 0x98e4148a, 0x283330c9, 0x49ff5867},
875 0xd26752ba}, 956 {0x786f2032, 0x0000002d, 0x0000060f, 0xf201600a, 0xf561bfcd, 0x8467f211},
876 {0xea5ec3b4, 0x0000002a, 0x000004fe, 0x869965dc, 0x6c1f833b, 957 {0xfebe4e1f, 0x0000002a, 0x000004f2, 0x95e51961, 0xfd80dcab, 0x3f9683b2},
877 0x8b1fcd62}, 958 {0x1a6e0a39, 0x00000008, 0x00000672, 0x8af6c2a5, 0x78dd84cb, 0x76a3f874},
878 {0x2dfb005d, 0x00000016, 0x00000345, 0x6a3b117e, 0xf05e8521, 959 {0x56000ab8, 0x0000000e, 0x000000e5, 0x36bacb8f, 0x22ee1f77, 0x863b702f},
879 0xf54342fe}, 960 {0x4717fe0c, 0x00000000, 0x000006ec, 0x8439f342, 0x5c8e03da, 0xdc6c58ff},
880 {0x5a214ade, 0x00000020, 0x000005b6, 0x467f70be, 0xcb22ccd3, 961 {0xd5d5d68e, 0x0000003c, 0x000003a3, 0x46fff083, 0x177d1b39, 0x0622cc95},
881 0x5b95b988}, 962 {0xc25dd6c6, 0x00000024, 0x000006c0, 0x5ceb8eb4, 0x892b0d16, 0xe85605cd},
882 {0xf0ab9cca, 0x00000032, 0x00000515, 0xed223df3, 0x7f3ef01d, 963 {0xe9b11300, 0x00000023, 0x00000683, 0x07a5d59a, 0x6c6a3208, 0x31da5f06},
883 0x2e1176be}, 964 {0x95cd285e, 0x00000001, 0x00000047, 0x7b3a4368, 0x0202c07e, 0xa1f2e784},
884 {0x91b444f9, 0x0000002e, 0x000007f8, 0x84e9a983, 0x5676756f, 965 {0xd9245a25, 0x0000001e, 0x000003a6, 0xd33c1841, 0x1936c0d5, 0xb07cc616},
885 0x66120546}, 966 {0x103279db, 0x00000006, 0x0000039b, 0xca09b8a0, 0x77d62892, 0xbf943b6c},
886 {0x1b5d2ddb, 0x0000002e, 0x0000012c, 0xba638c4c, 0x3f42047b, 967 {0x1cba3172, 0x00000027, 0x000001c8, 0xcb377194, 0xebe682db, 0x2c01af1c},
887 0xf256a5cc}, 968 {0x8f613739, 0x0000000c, 0x000001df, 0xb4b0bc87, 0x7710bd43, 0x0fe5f56d},
888 {0xd824d1bb, 0x0000003a, 0x000007b5, 0x6288653b, 0x3a3ebea0, 969 {0x1c6aa90d, 0x0000001b, 0x0000053c, 0x70559245, 0xda7894ac, 0xf8943b2d},
889 0x4af1dd69}, 970 {0xaabe5b93, 0x0000003d, 0x00000715, 0xcdbf42fa, 0x0c3b99e7, 0xe4d89272},
890 {0x0470180c, 0x00000034, 0x000001f0, 0x9d5b80d6, 0x3de08195, 971 {0xf15dd038, 0x00000006, 0x000006db, 0x6e104aea, 0x8d5967f2, 0x7c2f6bbb},
891 0x56f0a04a}, 972 {0x584dd49c, 0x00000020, 0x000007bc, 0x36b6cfd6, 0xad4e23b2, 0xabbf388b},
892 {0xffaa3a3f, 0x00000036, 0x00000299, 0xf3a82ab8, 0x53e0c13d, 973 {0x5d8c9506, 0x00000020, 0x00000470, 0x4c62378e, 0x31d92640, 0x1dca1f4e},
893 0x74f6b6b2}, 974 {0xb80d17b0, 0x00000032, 0x00000346, 0x22a5bb88, 0x9a7ec89f, 0x5c170e23},
894 {0x6406cfeb, 0x00000023, 0x00000600, 0xa920b8e8, 0xe4e2acf4, 975 {0xdaf0592e, 0x00000023, 0x000007b0, 0x3cab3f99, 0x9b1fdd99, 0xc0e9d672},
895 0x085951fd}, 976 {0x4793cc85, 0x0000000d, 0x00000706, 0xe82e04f6, 0xed3db6b7, 0xc18bdc86},
896 {0xb24aaa38, 0x0000003e, 0x000004a1, 0x657cc328, 0x5077b2c3, 977 {0x82ebf64e, 0x00000009, 0x000007c3, 0x69d590a9, 0x9efa8499, 0xa874fcdd},
897 0xc65387eb}, 978 {0xb18a0319, 0x00000026, 0x000007db, 0x1cf98dcc, 0x8fa9ad6a, 0x9dc0bb48},
898 {0x58b2ab7c, 0x00000039, 0x000002b4, 0x3a17ee7e, 0x9dcb3643,
899 0x1ca9257b},
900 {0x3db85970, 0x00000006, 0x000002b6, 0x95268b59, 0xb9812c10,
901 0xfd196d76},
902 {0x857830c5, 0x00000003, 0x00000590, 0x4ef439d5, 0xf042161d,
903 0x5ef88339},
904 {0xe1fcd978, 0x0000003e, 0x000007d8, 0xae8d8699, 0xce0a1ef5,
905 0x2c3714d9},
906 {0xb982a768, 0x00000016, 0x000006e0, 0x62fad3df, 0x5f8a067b,
907 0x58576548},
908 {0x1d581ce8, 0x0000001e, 0x0000058b, 0xf0f5da53, 0x26e39eee,
909 0xfd7c57de},
910 {0x2456719b, 0x00000025, 0x00000503, 0x4296ac64, 0xd50e4c14,
911 0xd5fedd59},
912 {0xfae6d8f2, 0x00000000, 0x0000055d, 0x057fdf2e, 0x2a31391a,
913 0x1cc3b17b},
914 {0xcba828e3, 0x00000039, 0x000002ce, 0xe3f22351, 0x8f00877b,
915 0x270eed73},
916 {0x13d25952, 0x0000000a, 0x0000072d, 0x76d4b4cc, 0x5eb67ec3,
917 0x91ecbb11},
918 {0x0342be3f, 0x00000015, 0x00000599, 0xec75d9f1, 0x9d4d2826,
919 0x05ed8d0c},
920 {0xeaa344e0, 0x00000014, 0x000004d8, 0x72a4c981, 0x2064ea06,
921 0x0b09ad5b},
922 {0xbbb52021, 0x0000003b, 0x00000272, 0x04af99fc, 0xaf042d35,
923 0xf8d511fb},
924 {0xb66384dc, 0x0000001d, 0x000007fc, 0xd7629116, 0x782bd801,
925 0x5ad832cc},
926 {0x616c01b6, 0x00000022, 0x000002c8, 0x5b1dab30, 0x783ce7d2,
927 0x1214d196},
928 {0xce2bdaad, 0x00000016, 0x0000062a, 0x932535c8, 0x3f02926d,
929 0x5747218a},
930 {0x00fe84d7, 0x00000005, 0x00000205, 0x850e50aa, 0x753d649c,
931 0xde8f14de},
932 {0xbebdcb4c, 0x00000006, 0x0000055d, 0xbeaa37a2, 0x2d8c9eba,
933 0x3563b7b9},
934 {0xd8b1a02a, 0x00000010, 0x00000387, 0x5017d2fc, 0x503541a5,
935 0x071475d0},
936 {0x3b96cad2, 0x00000036, 0x00000347, 0x1d2372ae, 0x926cd90b,
937 0x54c79d60},
938 {0xc94c1ed7, 0x00000005, 0x0000038b, 0x9e9fdb22, 0x144a9178,
939 0x4c53eee6},
940 {0x1aad454e, 0x00000025, 0x000002b2, 0xc3f6315c, 0x5c7a35b3,
941 0x10137a3c},
942 {0xa4fec9a6, 0x00000000, 0x000006d6, 0x90be5080, 0xa4107605,
943 0xaa9d6c73},
944 {0x1bbe71e2, 0x0000001f, 0x000002fd, 0x4e504c3b, 0x284ccaf1,
945 0xb63d23e7},
946 {0x4201c7e4, 0x00000002, 0x000002b7, 0x7822e3f9, 0x0cc912a9,
947 0x7f53e9cf},
948 {0x23fddc96, 0x00000003, 0x00000627, 0x8a385125, 0x07767e78,
949 0x13c1cd83},
950 {0xd82ba25c, 0x00000016, 0x0000063e, 0x98e4148a, 0x283330c9,
951 0x49ff5867},
952 {0x786f2032, 0x0000002d, 0x0000060f, 0xf201600a, 0xf561bfcd,
953 0x8467f211},
954 {0xfebe4e1f, 0x0000002a, 0x000004f2, 0x95e51961, 0xfd80dcab,
955 0x3f9683b2},
956 {0x1a6e0a39, 0x00000008, 0x00000672, 0x8af6c2a5, 0x78dd84cb,
957 0x76a3f874},
958 {0x56000ab8, 0x0000000e, 0x000000e5, 0x36bacb8f, 0x22ee1f77,
959 0x863b702f},
960 {0x4717fe0c, 0x00000000, 0x000006ec, 0x8439f342, 0x5c8e03da,
961 0xdc6c58ff},
962 {0xd5d5d68e, 0x0000003c, 0x000003a3, 0x46fff083, 0x177d1b39,
963 0x0622cc95},
964 {0xc25dd6c6, 0x00000024, 0x000006c0, 0x5ceb8eb4, 0x892b0d16,
965 0xe85605cd},
966 {0xe9b11300, 0x00000023, 0x00000683, 0x07a5d59a, 0x6c6a3208,
967 0x31da5f06},
968 {0x95cd285e, 0x00000001, 0x00000047, 0x7b3a4368, 0x0202c07e,
969 0xa1f2e784},
970 {0xd9245a25, 0x0000001e, 0x000003a6, 0xd33c1841, 0x1936c0d5,
971 0xb07cc616},
972 {0x103279db, 0x00000006, 0x0000039b, 0xca09b8a0, 0x77d62892,
973 0xbf943b6c},
974 {0x1cba3172, 0x00000027, 0x000001c8, 0xcb377194, 0xebe682db,
975 0x2c01af1c},
976 {0x8f613739, 0x0000000c, 0x000001df, 0xb4b0bc87, 0x7710bd43,
977 0x0fe5f56d},
978 {0x1c6aa90d, 0x0000001b, 0x0000053c, 0x70559245, 0xda7894ac,
979 0xf8943b2d},
980 {0xaabe5b93, 0x0000003d, 0x00000715, 0xcdbf42fa, 0x0c3b99e7,
981 0xe4d89272},
982 {0xf15dd038, 0x00000006, 0x000006db, 0x6e104aea, 0x8d5967f2,
983 0x7c2f6bbb},
984 {0x584dd49c, 0x00000020, 0x000007bc, 0x36b6cfd6, 0xad4e23b2,
985 0xabbf388b},
986 {0x5d8c9506, 0x00000020, 0x00000470, 0x4c62378e, 0x31d92640,
987 0x1dca1f4e},
988 {0xb80d17b0, 0x00000032, 0x00000346, 0x22a5bb88, 0x9a7ec89f,
989 0x5c170e23},
990 {0xdaf0592e, 0x00000023, 0x000007b0, 0x3cab3f99, 0x9b1fdd99,
991 0xc0e9d672},
992 {0x4793cc85, 0x0000000d, 0x00000706, 0xe82e04f6, 0xed3db6b7,
993 0xc18bdc86},
994 {0x82ebf64e, 0x00000009, 0x000007c3, 0x69d590a9, 0x9efa8499,
995 0xa874fcdd},
996 {0xb18a0319, 0x00000026, 0x000007db, 0x1cf98dcc, 0x8fa9ad6a,
997 0x9dc0bb48},
998}; 979};
999 980
1000#include <linux/time.h> 981#include <linux/time.h>
@@ -1050,6 +1031,40 @@ static int __init crc32c_test(void)
1050 return 0; 1031 return 0;
1051} 1032}
1052 1033
1034static int __init crc32c_combine_test(void)
1035{
1036 int i, j;
1037 int errors = 0, runs = 0;
1038
1039 for (i = 0; i < 100; i++) {
1040 u32 crc_full;
1041
1042 crc_full = __crc32c_le(test[i].crc, test_buf + test[i].start,
1043 test[i].length);
1044 for (j = 0; j <= test[i].length; ++j) {
1045 u32 crc1, crc2;
1046 u32 len1 = j, len2 = test[i].length - j;
1047
1048 crc1 = __crc32c_le(test[i].crc, test_buf +
1049 test[i].start, len1);
1050 crc2 = __crc32c_le(0, test_buf + test[i].start +
1051 len1, len2);
1052
1053 if (!(crc_full == __crc32c_le_combine(crc1, crc2, len2) &&
1054 crc_full == test[i].crc32c_le))
1055 errors++;
1056 runs++;
1057 }
1058 }
1059
1060 if (errors)
1061 pr_warn("crc32c_combine: %d/%d self tests failed\n", errors, runs);
1062 else
1063 pr_info("crc32c_combine: %d self tests passed\n", runs);
1064
1065 return 0;
1066}
1067
1053static int __init crc32_test(void) 1068static int __init crc32_test(void)
1054{ 1069{
1055 int i; 1070 int i;
@@ -1109,10 +1124,48 @@ static int __init crc32_test(void)
1109 return 0; 1124 return 0;
1110} 1125}
1111 1126
1127static int __init crc32_combine_test(void)
1128{
1129 int i, j;
1130 int errors = 0, runs = 0;
1131
1132 for (i = 0; i < 100; i++) {
1133 u32 crc_full;
1134
1135 crc_full = crc32_le(test[i].crc, test_buf + test[i].start,
1136 test[i].length);
1137 for (j = 0; j <= test[i].length; ++j) {
1138 u32 crc1, crc2;
1139 u32 len1 = j, len2 = test[i].length - j;
1140
1141 crc1 = crc32_le(test[i].crc, test_buf +
1142 test[i].start, len1);
1143 crc2 = crc32_le(0, test_buf + test[i].start +
1144 len1, len2);
1145
1146 if (!(crc_full == crc32_le_combine(crc1, crc2, len2) &&
1147 crc_full == test[i].crc_le))
1148 errors++;
1149 runs++;
1150 }
1151 }
1152
1153 if (errors)
1154 pr_warn("crc32_combine: %d/%d self tests failed\n", errors, runs);
1155 else
1156 pr_info("crc32_combine: %d self tests passed\n", runs);
1157
1158 return 0;
1159}
1160
1112static int __init crc32test_init(void) 1161static int __init crc32test_init(void)
1113{ 1162{
1114 crc32_test(); 1163 crc32_test();
1115 crc32c_test(); 1164 crc32c_test();
1165
1166 crc32_combine_test();
1167 crc32c_combine_test();
1168
1116 return 0; 1169 return 0;
1117} 1170}
1118 1171
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 0ab32faa520f..31aab5376cb4 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -1928,9 +1928,8 @@ fault:
1928EXPORT_SYMBOL(skb_store_bits); 1928EXPORT_SYMBOL(skb_store_bits);
1929 1929
1930/* Checksum skb data. */ 1930/* Checksum skb data. */
1931 1931__wsum __skb_checksum(const struct sk_buff *skb, int offset, int len,
1932__wsum skb_checksum(const struct sk_buff *skb, int offset, 1932 __wsum csum, const struct skb_checksum_ops *ops)
1933 int len, __wsum csum)
1934{ 1933{
1935 int start = skb_headlen(skb); 1934 int start = skb_headlen(skb);
1936 int i, copy = start - offset; 1935 int i, copy = start - offset;
@@ -1941,7 +1940,7 @@ __wsum skb_checksum(const struct sk_buff *skb, int offset,
1941 if (copy > 0) { 1940 if (copy > 0) {
1942 if (copy > len) 1941 if (copy > len)
1943 copy = len; 1942 copy = len;
1944 csum = csum_partial(skb->data + offset, copy, csum); 1943 csum = ops->update(skb->data + offset, copy, csum);
1945 if ((len -= copy) == 0) 1944 if ((len -= copy) == 0)
1946 return csum; 1945 return csum;
1947 offset += copy; 1946 offset += copy;
@@ -1962,10 +1961,10 @@ __wsum skb_checksum(const struct sk_buff *skb, int offset,
1962 if (copy > len) 1961 if (copy > len)
1963 copy = len; 1962 copy = len;
1964 vaddr = kmap_atomic(skb_frag_page(frag)); 1963 vaddr = kmap_atomic(skb_frag_page(frag));
1965 csum2 = csum_partial(vaddr + frag->page_offset + 1964 csum2 = ops->update(vaddr + frag->page_offset +
1966 offset - start, copy, 0); 1965 offset - start, copy, 0);
1967 kunmap_atomic(vaddr); 1966 kunmap_atomic(vaddr);
1968 csum = csum_block_add(csum, csum2, pos); 1967 csum = ops->combine(csum, csum2, pos, copy);
1969 if (!(len -= copy)) 1968 if (!(len -= copy))
1970 return csum; 1969 return csum;
1971 offset += copy; 1970 offset += copy;
@@ -1984,9 +1983,9 @@ __wsum skb_checksum(const struct sk_buff *skb, int offset,
1984 __wsum csum2; 1983 __wsum csum2;
1985 if (copy > len) 1984 if (copy > len)
1986 copy = len; 1985 copy = len;
1987 csum2 = skb_checksum(frag_iter, offset - start, 1986 csum2 = __skb_checksum(frag_iter, offset - start,
1988 copy, 0); 1987 copy, 0, ops);
1989 csum = csum_block_add(csum, csum2, pos); 1988 csum = ops->combine(csum, csum2, pos, copy);
1990 if ((len -= copy) == 0) 1989 if ((len -= copy) == 0)
1991 return csum; 1990 return csum;
1992 offset += copy; 1991 offset += copy;
@@ -1998,6 +1997,18 @@ __wsum skb_checksum(const struct sk_buff *skb, int offset,
1998 1997
1999 return csum; 1998 return csum;
2000} 1999}
2000EXPORT_SYMBOL(__skb_checksum);
2001
2002__wsum skb_checksum(const struct sk_buff *skb, int offset,
2003 int len, __wsum csum)
2004{
2005 const struct skb_checksum_ops ops = {
2006 .update = csum_partial,
2007 .combine = csum_block_add_ext,
2008 };
2009
2010 return __skb_checksum(skb, offset, len, csum, &ops);
2011}
2001EXPORT_SYMBOL(skb_checksum); 2012EXPORT_SYMBOL(skb_checksum);
2002 2013
2003/* Both of above in one bottle. */ 2014/* Both of above in one bottle. */
diff --git a/net/sctp/output.c b/net/sctp/output.c
index 319137340d15..e650978daf27 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -390,7 +390,6 @@ int sctp_packet_transmit(struct sctp_packet *packet)
390 __u8 has_data = 0; 390 __u8 has_data = 0;
391 struct dst_entry *dst = tp->dst; 391 struct dst_entry *dst = tp->dst;
392 unsigned char *auth = NULL; /* pointer to auth in skb data */ 392 unsigned char *auth = NULL; /* pointer to auth in skb data */
393 __u32 cksum_buf_len = sizeof(struct sctphdr);
394 393
395 pr_debug("%s: packet:%p\n", __func__, packet); 394 pr_debug("%s: packet:%p\n", __func__, packet);
396 395
@@ -493,7 +492,6 @@ int sctp_packet_transmit(struct sctp_packet *packet)
493 if (chunk == packet->auth) 492 if (chunk == packet->auth)
494 auth = skb_tail_pointer(nskb); 493 auth = skb_tail_pointer(nskb);
495 494
496 cksum_buf_len += chunk->skb->len;
497 memcpy(skb_put(nskb, chunk->skb->len), 495 memcpy(skb_put(nskb, chunk->skb->len),
498 chunk->skb->data, chunk->skb->len); 496 chunk->skb->data, chunk->skb->len);
499 497
@@ -538,12 +536,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)
538 if (!sctp_checksum_disable) { 536 if (!sctp_checksum_disable) {
539 if (!(dst->dev->features & NETIF_F_SCTP_CSUM) || 537 if (!(dst->dev->features & NETIF_F_SCTP_CSUM) ||
540 (dst_xfrm(dst) != NULL) || packet->ipfragok) { 538 (dst_xfrm(dst) != NULL) || packet->ipfragok) {
541 __u32 crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len); 539 sh->checksum = sctp_compute_cksum(nskb, 0);
542
543 /* 3) Put the resultant value into the checksum field in the
544 * common header, and leave the rest of the bits unchanged.
545 */
546 sh->checksum = sctp_end_cksum(crc32);
547 } else { 540 } else {
548 /* no need to seed pseudo checksum for SCTP */ 541 /* no need to seed pseudo checksum for SCTP */
549 nskb->ip_summed = CHECKSUM_PARTIAL; 542 nskb->ip_summed = CHECKSUM_PARTIAL;
generated by cgit v1.2.2 (git 2.25.0) at 2026-04-27 06:24:32 -0400