Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[linux-2.6-block.git] / net / core / utils.c

diff --git a/net/core/utils.c b/net/core/utils.c
index 7b803884c162834ddc5327805e6b0e3a636a82f0..a7732a06804376aa321c9982faaf981ad3c51c87 100644 (file)
--- a/net/core/utils.c
+++ b/net/core/utils.c
@@ -304,13 +304,15 @@ void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,
                              __be32 from, __be32 to, int pseudohdr)
 {
        if (skb->ip_summed != CHECKSUM_PARTIAL) {
-               *sum = csum_fold(csum_add(csum_sub(~csum_unfold(*sum), from),
-                                to));
+               csum_replace4(sum, from, to);
                if (skb->ip_summed == CHECKSUM_COMPLETE && pseudohdr)
-                       skb->csum = ~csum_add(csum_sub(~(skb->csum), from), to);
+                       skb->csum = ~csum_add(csum_sub(~(skb->csum),
+                                                      (__force __wsum)from),
+                                             (__force __wsum)to);
        } else if (pseudohdr)
-               *sum = ~csum_fold(csum_add(csum_sub(csum_unfold(*sum), from),
-                                 to));
+               *sum = ~csum_fold(csum_add(csum_sub(csum_unfold(*sum),
+                                                   (__force __wsum)from),
+                                          (__force __wsum)to));
 }
 EXPORT_SYMBOL(inet_proto_csum_replace4);