Pull style into test branch

[linux-2.6-omap-h63xx.git] / include / net / tcp.h

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 826aaecdb994f48ad2423cb5506bb3ffbedfcbac..c99774f15eba92d76a43a6a76eae5773be6224a8 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -814,7 +814,7 @@ static inline __sum16 tcp_v4_check(struct tcphdr *th, int len,
        return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base);
 }
 
-static inline int __tcp_checksum_complete(struct sk_buff *skb)
+static inline __sum16 __tcp_checksum_complete(struct sk_buff *skb)
 {
        return __skb_checksum_complete(skb);
 }
@@ -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);