diff options
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/iovec.c | 4 | ||||
-rw-r--r-- | net/core/skbuff.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/core/iovec.c b/net/core/iovec.c index 65e4b56fbc77..04b249c40b5b 100644 --- a/net/core/iovec.c +++ b/net/core/iovec.c | |||
@@ -158,9 +158,9 @@ int memcpy_fromiovecend(unsigned char *kdata, struct iovec *iov, int offset, | |||
158 | * call to this function will be unaligned also. | 158 | * call to this function will be unaligned also. |
159 | */ | 159 | */ |
160 | int csum_partial_copy_fromiovecend(unsigned char *kdata, struct iovec *iov, | 160 | int csum_partial_copy_fromiovecend(unsigned char *kdata, struct iovec *iov, |
161 | int offset, unsigned int len, int *csump) | 161 | int offset, unsigned int len, __wsum *csump) |
162 | { | 162 | { |
163 | int csum = *csump; | 163 | __wsum csum = *csump; |
164 | int partial_cnt = 0, err = 0; | 164 | int partial_cnt = 0, err = 0; |
165 | 165 | ||
166 | /* Skip over the finished iovecs */ | 166 | /* Skip over the finished iovecs */ |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index dfa02cc8d687..c0e3427057fc 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -1265,7 +1265,7 @@ unsigned int skb_checksum(const struct sk_buff *skb, int offset, | |||
1265 | 1265 | ||
1266 | end = start + skb_shinfo(skb)->frags[i].size; | 1266 | end = start + skb_shinfo(skb)->frags[i].size; |
1267 | if ((copy = end - offset) > 0) { | 1267 | if ((copy = end - offset) > 0) { |
1268 | unsigned int csum2; | 1268 | __wsum csum2; |
1269 | u8 *vaddr; | 1269 | u8 *vaddr; |
1270 | skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; | 1270 | skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; |
1271 | 1271 | ||