[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>

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 4a3c1564d17afe2bd4d6bf63f4d26e6b466b2dcb..983b50d9dc6cacb4e58bd2d36560c18701ea8ee5 100644 (file)
--- 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 f068cca6228008e9f4c85e24cc690344c618f79a..f7d462f0cd05baf9f3fa80bea64a36826536bae9 100644 (file)
--- 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);
                        }