From 20fe5cbf63c915791f26ca7b24bac88b8c3c7ee9 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 14 Nov 2006 21:28:51 -0800
Subject: [PATCH] --- yaml --- r: 41713 b: refs/heads/master c:
 2bda2853150e20ca2a44627d00b5f85af0b24a42 h: refs/heads/master i:   41711:
 a10ba658e72620e502e88ebab6f3bf1d2ed8c140 v: v3

---
 [refs]                | 2 +-
 trunk/net/dccp/ipv4.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 92caa7d82aad..2e9221df4af1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b11687ef003ed595033da89643c8995676f929d
+refs/heads/master: 2bda2853150e20ca2a44627d00b5f85af0b24a42
diff --git a/trunk/net/dccp/ipv4.c b/trunk/net/dccp/ipv4.c
index 35985334daee..6bca71929de5 100644
--- a/trunk/net/dccp/ipv4.c
+++ b/trunk/net/dccp/ipv4.c
@@ -344,7 +344,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
 	sock_put(sk);
 }
 
-static inline u16 dccp_v4_csum_finish(struct sk_buff *skb,
+static inline __sum16 dccp_v4_csum_finish(struct sk_buff *skb,
 				      __be32 src, __be32 dst)
 {
 	return csum_tcpudp_magic(src, dst, skb->len, IPPROTO_DCCP, skb->csum);