summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2020-07-11 06:12:07 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2020-08-20 21:45:14 +0200
commitcc44c17baf7f3f833d36b2f2a1edb1cc0b6f2cc4 (patch)
tree78e1d7c77dfd8cc862ba559d4c4c6653a5002c1b /net/ipv4
parentunify generic instances of csum_partial_copy_nocheck() (diff)
downloadlinux-cc44c17baf7f3f833d36b2f2a1edb1cc0b6f2cc4.tar.xz
linux-cc44c17baf7f3f833d36b2f2a1edb1cc0b6f2cc4.zip
csum_partial_copy_nocheck(): drop the last argument
It's always 0. Note that we theoretically could use ~0U as well - result will be the same modulo 0xffff, _if_ the damn thing did the right thing for any value of initial sum; later we'll make use of that when convenient. However, unlike csum_and_copy_..._user(), there are instances that did not work for arbitrary initial sums; c6x is one such. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/icmp.c2
-rw-r--r--net/ipv4/ip_output.c2
-rw-r--r--net/ipv4/raw.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index e23dd5fc2e73..bdaaee52c41b 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -381,7 +381,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param,
csum = csum_partial_copy_nocheck((void *)&icmp_param->data,
(char *)icmph,
- icmp_param->head_len, 0);
+ icmp_param->head_len);
skb_queue_walk(&sk->sk_write_queue, skb1) {
csum = csum_add(csum, skb1->csum);
}
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 5bd059853376..bd79ea3e8c44 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1648,7 +1648,7 @@ static int ip_reply_glue_bits(void *dptr, char *to, int offset,
{
__wsum csum;
- csum = csum_partial_copy_nocheck(dptr+offset, to, len, 0);
+ csum = csum_partial_copy_nocheck(dptr+offset, to, len);
skb->csum = csum_block_add(skb->csum, csum, odd);
return 0;
}
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 6fd4330287c2..79392154c30a 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -478,7 +478,7 @@ static int raw_getfrag(void *from, char *to, int offset, int len, int odd,
skb->csum = csum_block_add(
skb->csum,
csum_partial_copy_nocheck(rfv->hdr.c + offset,
- to, copy, 0),
+ to, copy),
odd);
odd = 0;