diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2020-07-10 20:10:34 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2020-08-20 15:45:13 -0400 |
| commit | 3ea7ca80d9c0ff606b5a129dce2354f771a9e4e8 (patch) | |
| tree | ae8c8273ddbd4d7602b60c03a5a5a1eb7d944331 /net/ipv4/icmp.c | |
| parent | skb_copy_and_csum_bits(): don't bother with the last argument (diff) | |
| download | linux-dev-3ea7ca80d9c0ff606b5a129dce2354f771a9e4e8.tar.xz linux-dev-3ea7ca80d9c0ff606b5a129dce2354f771a9e4e8.zip | |
icmp_push_reply(): reorder adding the checksum up
do csum_partial_copy_nocheck() on the first fragment, then
add the rest to it. Equivalent transformation.
That was the only caller of csum_partial_copy_nocheck() that
might pass it non-zero as the last argument.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/ipv4/icmp.c')
| -rw-r--r-- | net/ipv4/icmp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index d15f78053ef4..e23dd5fc2e73 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -376,15 +376,15 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param, ip_flush_pending_frames(sk); } else if ((skb = skb_peek(&sk->sk_write_queue)) != NULL) { struct icmphdr *icmph = icmp_hdr(skb); - __wsum csum = 0; + __wsum csum; struct sk_buff *skb1; + csum = csum_partial_copy_nocheck((void *)&icmp_param->data, + (char *)icmph, + icmp_param->head_len, 0); skb_queue_walk(&sk->sk_write_queue, skb1) { csum = csum_add(csum, skb1->csum); } - csum = csum_partial_copy_nocheck((void *)&icmp_param->data, - (char *)icmph, - icmp_param->head_len, csum); icmph->checksum = csum_fold(csum); skb->ip_summed = CHECKSUM_NONE; ip_push_pending_frames(sk, fl4); |