Commit 7511efde authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller

[IPV4/IPV6]: Use csum_sub() instead of csum_block_sub() w/zero 3rd arg.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 041d6e04
...@@ -881,8 +881,8 @@ int ip_append_data(struct sock *sk, ...@@ -881,8 +881,8 @@ int ip_append_data(struct sock *sk,
skb->csum = skb_copy_and_csum_bits( skb->csum = skb_copy_and_csum_bits(
skb_prev, maxfraglen, skb_prev, maxfraglen,
data + transhdrlen, fraggap, 0); data + transhdrlen, fraggap, 0);
skb_prev->csum = csum_block_sub( skb_prev->csum = csum_sub(skb_prev->csum,
skb_prev->csum, skb->csum, 0); skb->csum);
data += fraggap; data += fraggap;
skb_trim(skb_prev, maxfraglen); skb_trim(skb_prev, maxfraglen);
} }
...@@ -1065,8 +1065,8 @@ ssize_t ip_append_page(struct sock *sk, struct page *page, ...@@ -1065,8 +1065,8 @@ ssize_t ip_append_page(struct sock *sk, struct page *page,
skb->csum = skb_copy_and_csum_bits( skb->csum = skb_copy_and_csum_bits(
skb_prev, maxfraglen, skb_prev, maxfraglen,
data, fraggap, 0); data, fraggap, 0);
skb_prev->csum = csum_block_sub( skb_prev->csum = csum_sub(skb_prev->csum,
skb_prev->csum, skb->csum, 0); skb->csum);
skb_trim(skb_prev, maxfraglen); skb_trim(skb_prev, maxfraglen);
} }
......
...@@ -977,8 +977,8 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, int offse ...@@ -977,8 +977,8 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, int offse
skb->csum = skb_copy_and_csum_bits( skb->csum = skb_copy_and_csum_bits(
skb_prev, maxfraglen, skb_prev, maxfraglen,
data + transhdrlen, fraggap, 0); data + transhdrlen, fraggap, 0);
skb_prev->csum = csum_block_sub( skb_prev->csum = csum_sub(skb_prev->csum,
skb_prev->csum, skb->csum, 0); skb->csum);
data += fraggap; data += fraggap;
skb_trim(skb_prev, maxfraglen); skb_trim(skb_prev, maxfraglen);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment