3 files changed, 4 insertions, 4 deletions

diff --git a/include/net/tcp.h b/include/net/tcp.h
index aa7989c53791..c99774f15eba 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1154,7 +1154,7 @@ extern int			tcp_v4_md5_do_add(struct sock *sk,
                                                   u8 newkeylen);
 
 extern int                      tcp_v4_md5_do_del(struct sock *sk,
-                                                  u32 addr);
+                                                  __be32 addr);
 
 extern struct tcp_md5sig_pool   **tcp_alloc_md5sig_pool(void);
 extern void                     tcp_free_md5sig_pool(void);
diff --git a/include/net/udp.h b/include/net/udp.h
index c5ccd9a3387b..eac69ff0582c 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -77,7 +77,7 @@ static inline __sum16 __udp_lib_checksum_complete(struct sk_buff *skb)
                                       skb->csum));
 }
 
-static inline __sum16 udp_lib_checksum_complete(struct sk_buff *skb)
+static inline int udp_lib_checksum_complete(struct sk_buff *skb)
 {
         return skb->ip_summed != CHECKSUM_UNNECESSARY &&
                 __udp_lib_checksum_complete(skb);
diff --git a/include/net/udplite.h b/include/net/udplite.h
index 3abaab7b78c6..67ac51424307 100644
--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -90,9 +90,9 @@ static __inline__ int udplite6_csum_init(struct sk_buff *skb, struct udphdr *uh)
         int rc = udplite_checksum_init(skb, uh);
 
         if (!rc)
-                skb->csum = ~csum_ipv6_magic(&skb->nh.ipv6h->saddr,
+                skb->csum = ~csum_unfold(csum_ipv6_magic(&skb->nh.ipv6h->saddr,
                                              &skb->nh.ipv6h->daddr,
-                                             skb->len, IPPROTO_UDPLITE, 0);
+                                             skb->len, IPPROTO_UDPLITE, 0));
         return rc;
 }