summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2004-09-02 00:50:38 -0700
committerDavid S. Miller <davem@nuts.davemloft.net>2004-09-02 00:50:38 -0700
commit7511efde752adf64716a572d814bd32d517debdc (patch)
tree74e58c34ea40b020fdfe44fcbc79f455a24027a7
parent041d6e0468098eb2ae9fbdd96457203ae5a17719 (diff)
[IPV4/IPV6]: Use csum_sub() instead of csum_block_sub() w/zero 3rd arg.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/ip_output.c8
-rw-r--r--net/ipv6/ip6_output.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 4a3c1564d17a..983b50d9dc6c 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -881,8 +881,8 @@ alloc_new_skb:
skb->csum = skb_copy_and_csum_bits(
skb_prev, maxfraglen,
data + transhdrlen, fraggap, 0);
- skb_prev->csum = csum_block_sub(
- skb_prev->csum, skb->csum, 0);
+ skb_prev->csum = csum_sub(skb_prev->csum,
+ skb->csum);
data += fraggap;
skb_trim(skb_prev, maxfraglen);
}
@@ -1065,8 +1065,8 @@ ssize_t ip_append_page(struct sock *sk, struct page *page,
skb->csum = skb_copy_and_csum_bits(
skb_prev, maxfraglen,
data, fraggap, 0);
- skb_prev->csum = csum_block_sub(
- skb_prev->csum, skb->csum, 0);
+ skb_prev->csum = csum_sub(skb_prev->csum,
+ skb->csum);
skb_trim(skb_prev, maxfraglen);
}
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index f068cca62280..f7d462f0cd05 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -977,8 +977,8 @@ alloc_new_skb:
skb->csum = skb_copy_and_csum_bits(
skb_prev, maxfraglen,
data + transhdrlen, fraggap, 0);
- skb_prev->csum = csum_block_sub(
- skb_prev->csum, skb->csum, 0);
+ skb_prev->csum = csum_sub(skb_prev->csum,
+ skb->csum);
data += fraggap;
skb_trim(skb_prev, maxfraglen);
}