2 files changed, 5 insertions, 4 deletions

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 363960872de..826aaecdb99 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -807,9 +807,9 @@ static inline void tcp_update_wl(struct tcp_sock *tp, u32 ack, u32 seq)
 /*
  * Calculate(/check) TCP checksum
  */
-static inline u16 tcp_v4_check(struct tcphdr *th, int len,
-                               unsigned long saddr, unsigned long daddr, 
-                               unsigned long base)
+static inline __sum16 tcp_v4_check(struct tcphdr *th, int len,
+                               __be32 saddr, __be32 daddr,
+                               __wsum base)
 {
         return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base);
 }
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 98ba7509617..f9c4ed7207b 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -414,8 +414,9 @@ static void udp_flush_pending_frames(struct sock *sk)
 static void udp4_hwcsum_outgoing(struct sock *sk, struct sk_buff *skb,
                                  __be32 src, __be32 dst, int len      )
 {
-        unsigned int csum = 0, offset;
+        unsigned int offset;
         struct udphdr *uh = skb->h.uh;
+        __wsum csum = 0;
 
         if (skb_queue_len(&sk->sk_write_queue) == 1) {
                 /*