diff options
Diffstat (limited to 'arch/sh64/lib')
-rw-r--r-- | arch/sh64/lib/c-checksum.c | 49 |
1 files changed, 17 insertions, 32 deletions
diff --git a/arch/sh64/lib/c-checksum.c b/arch/sh64/lib/c-checksum.c index 0e8a742abf8c..4b2676380deb 100644 --- a/arch/sh64/lib/c-checksum.c +++ b/arch/sh64/lib/c-checksum.c | |||
@@ -118,24 +118,24 @@ static unsigned long do_csum(const unsigned char *buff, int len) | |||
118 | 118 | ||
119 | /* computes the checksum of a memory block at buff, length len, | 119 | /* computes the checksum of a memory block at buff, length len, |
120 | and adds in "sum" (32-bit) */ | 120 | and adds in "sum" (32-bit) */ |
121 | unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum) | 121 | __wsum csum_partial(const void *buff, int len, __wsum sum) |
122 | { | 122 | { |
123 | unsigned long long result = do_csum(buff, len); | 123 | unsigned long long result = do_csum(buff, len); |
124 | 124 | ||
125 | /* add in old sum, and carry.. */ | 125 | /* add in old sum, and carry.. */ |
126 | result += sum; | 126 | result += (__force u32)sum; |
127 | /* 32+c bits -> 32 bits */ | 127 | /* 32+c bits -> 32 bits */ |
128 | result = (result & 0xffffffff) + (result >> 32); | 128 | result = (result & 0xffffffff) + (result >> 32); |
129 | 129 | ||
130 | pr_debug("csum_partial, buff %p len %d sum 0x%x result=0x%016Lx\n", | 130 | pr_debug("csum_partial, buff %p len %d sum 0x%x result=0x%016Lx\n", |
131 | buff, len, sum, result); | 131 | buff, len, sum, result); |
132 | 132 | ||
133 | return result; | 133 | return (__force __wsum)result; |
134 | } | 134 | } |
135 | 135 | ||
136 | /* Copy while checksumming, otherwise like csum_partial. */ | 136 | /* Copy while checksumming, otherwise like csum_partial. */ |
137 | unsigned int | 137 | __wsum |
138 | csum_partial_copy(const unsigned char *src, unsigned char *dst, int len, unsigned int sum) | 138 | csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum) |
139 | { | 139 | { |
140 | sum = csum_partial(src, len, sum); | 140 | sum = csum_partial(src, len, sum); |
141 | memcpy(dst, src, len); | 141 | memcpy(dst, src, len); |
@@ -145,9 +145,9 @@ csum_partial_copy(const unsigned char *src, unsigned char *dst, int len, unsigne | |||
145 | 145 | ||
146 | /* Copy from userspace and compute checksum. If we catch an exception | 146 | /* Copy from userspace and compute checksum. If we catch an exception |
147 | then zero the rest of the buffer. */ | 147 | then zero the rest of the buffer. */ |
148 | unsigned int | 148 | __wsum |
149 | csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, int len, | 149 | csum_partial_copy_from_user(const void __user *src, void *dst, int len, |
150 | unsigned int sum, int *err_ptr) | 150 | __wsum sum, int *err_ptr) |
151 | { | 151 | { |
152 | int missing; | 152 | int missing; |
153 | 153 | ||
@@ -166,9 +166,9 @@ csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, int le | |||
166 | } | 166 | } |
167 | 167 | ||
168 | /* Copy to userspace and compute checksum. */ | 168 | /* Copy to userspace and compute checksum. */ |
169 | unsigned int | 169 | __wsum |
170 | csum_partial_copy_to_user(const unsigned char *src, unsigned char *dst, int len, | 170 | csum_partial_copy_to_user(const unsigned char *src, unsigned char *dst, int len, |
171 | unsigned int sum, int *err_ptr) | 171 | __wsum sum, int *err_ptr) |
172 | { | 172 | { |
173 | sum = csum_partial(src, len, sum); | 173 | sum = csum_partial(src, len, sum); |
174 | 174 | ||
@@ -182,28 +182,24 @@ csum_partial_copy_to_user(const unsigned char *src, unsigned char *dst, int len, | |||
182 | * This is a version of ip_compute_csum() optimized for IP headers, | 182 | * This is a version of ip_compute_csum() optimized for IP headers, |
183 | * which always checksum on 4 octet boundaries. | 183 | * which always checksum on 4 octet boundaries. |
184 | */ | 184 | */ |
185 | unsigned short ip_fast_csum(unsigned char *iph, unsigned int ihl) | 185 | __sum16 ip_fast_csum(const void *iph, unsigned int ihl) |
186 | { | 186 | { |
187 | pr_debug("ip_fast_csum %p,%d\n", iph, ihl); | 187 | pr_debug("ip_fast_csum %p,%d\n", iph, ihl); |
188 | 188 | ||
189 | return ~do_csum(iph, ihl * 4); | 189 | return (__force __sum16)~do_csum(iph, ihl * 4); |
190 | } | 190 | } |
191 | 191 | ||
192 | unsigned int csum_tcpudp_nofold(unsigned long saddr, | 192 | __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, |
193 | unsigned long daddr, | ||
194 | unsigned short len, | 193 | unsigned short len, |
195 | unsigned short proto, unsigned int sum) | 194 | unsigned short proto, __wsum sum) |
196 | { | 195 | { |
197 | unsigned long long result; | 196 | unsigned long long result; |
198 | 197 | ||
199 | pr_debug("ntohs(0x%x)=0x%x\n", 0xdead, ntohs(0xdead)); | 198 | pr_debug("ntohs(0x%x)=0x%x\n", 0xdead, ntohs(0xdead)); |
200 | pr_debug("htons(0x%x)=0x%x\n", 0xdead, htons(0xdead)); | 199 | pr_debug("htons(0x%x)=0x%x\n", 0xdead, htons(0xdead)); |
201 | 200 | ||
202 | result = ((unsigned long long) saddr + | 201 | result = (__force u64) saddr + (__force u64) daddr + |
203 | (unsigned long long) daddr + | 202 | (__force u64) sum + ((len + proto) << 8); |
204 | (unsigned long long) sum + | ||
205 | ((unsigned long long) ntohs(len) << 16) + | ||
206 | ((unsigned long long) proto << 8)); | ||
207 | 203 | ||
208 | /* Fold down to 32-bits so we don't loose in the typedef-less | 204 | /* Fold down to 32-bits so we don't loose in the typedef-less |
209 | network stack. */ | 205 | network stack. */ |
@@ -215,16 +211,5 @@ unsigned int csum_tcpudp_nofold(unsigned long saddr, | |||
215 | pr_debug("%s saddr %x daddr %x len %x proto %x sum %x result %08Lx\n", | 211 | pr_debug("%s saddr %x daddr %x len %x proto %x sum %x result %08Lx\n", |
216 | __FUNCTION__, saddr, daddr, len, proto, sum, result); | 212 | __FUNCTION__, saddr, daddr, len, proto, sum, result); |
217 | 213 | ||
218 | return result; | 214 | return (__wsum)result; |
219 | } | ||
220 | |||
221 | // Post SIM: | ||
222 | unsigned int | ||
223 | csum_partial_copy_nocheck(const unsigned char *src, unsigned char *dst, int len, unsigned int sum) | ||
224 | { | ||
225 | // unsigned dummy; | ||
226 | pr_debug("csum_partial_copy_nocheck src %p dst %p len %d\n", src, dst, | ||
227 | len); | ||
228 | |||
229 | return csum_partial_copy(src, dst, len, sum); | ||
230 | } | 215 | } |