---

yaml --- r: 41851 b: refs/heads/master c: 8e5200f h: refs/heads/master i: 41849: fbe130d 41847: 8232b65 v: v3
git-mirror · Dec 3, 2006 · 6ea9870 · 6ea9870
1 parent 4158eaa
commit 6ea9870
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34bcca28335977e969338c98c6c43a1e08f592b2
+refs/heads/master: 8e5200f54062b8af0ed1d186ea0f113854786d89
diff --git a/trunk/include/net/tcp.h b/trunk/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/trunk/include/net/udp.h b/trunk/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/trunk/include/net/udplite.h b/trunk/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;
 }
 

diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c
@@ -1020,7 +1020,7 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
 #ifdef CONFIG_TCP_MD5SIG_DEBUG
 	int i;
 #endif
-	__u16 old_checksum;
+	__sum16 old_checksum;
 	struct tcp_md5sig_pool *hp;
 	struct tcp4_pseudohdr *bp;
 	struct hash_desc *desc;

diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c
@@ -114,7 +114,7 @@ DEFINE_RWLOCK(udp_hash_lock);
 
 static int udp_port_rover;
 
-static inline int __udp_lib_lport_inuse(__be16 num, struct hlist_head udptable[])
+static inline int __udp_lib_lport_inuse(__u16 num, struct hlist_head udptable[])
 {
 	struct sock *sk;
 	struct hlist_node *node;
@@ -455,7 +455,7 @@ static int udp_push_pending_frames(struct sock *sk, struct udp_sock *up)
 	struct sk_buff *skb;
 	struct udphdr *uh;
 	int err = 0;
-	u32 csum = 0;
+	__wsum csum = 0;
 
 	/* Grab the skbuff where UDP header space exists. */
 	if ((skb = skb_peek(&sk->sk_write_queue)) == NULL)

diff --git a/trunk/net/ipv6/tcp_ipv6.c b/trunk/net/ipv6/tcp_ipv6.c
@@ -739,7 +739,7 @@ static int tcp_v6_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
 	struct scatterlist sg[4];
 	__u16 data_len;
 	int block = 0;
-	__u16 cksum;
+	__sum16 cksum;
 	struct tcp_md5sig_pool *hp;
 	struct tcp6_pseudohdr *bp;
 	struct hash_desc *desc;
@@ -1032,7 +1032,7 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
 
 #ifdef CONFIG_TCP_MD5SIG
 	if (key) {
-		u32 *opt = (u32*)(t1 + 1);
+		__be32 *opt = (__be32*)(t1 + 1);
 		opt[0] = htonl((TCPOPT_NOP << 24) |
 			       (TCPOPT_NOP << 16) |
 			       (TCPOPT_MD5SIG << 8) |

diff --git a/trunk/net/ipv6/udp.c b/trunk/net/ipv6/udp.c
@@ -248,7 +248,7 @@ void __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
 static __inline__ void udpv6_err(struct sk_buff *skb,
 				 struct inet6_skb_parm *opt, int type,
-				 int code, int offset, __u32 info     )
+				 int code, int offset, __be32 info     )
 {
 	return __udp6_lib_err(skb, opt, type, code, offset, info, udp_hash);
 }

diff --git a/trunk/net/ipv6/udplite.c b/trunk/net/ipv6/udplite.c
@@ -24,7 +24,7 @@ static __inline__ int udplitev6_rcv(struct sk_buff **pskb)
 
 static __inline__ void udplitev6_err(struct sk_buff *skb,
 				     struct inet6_skb_parm *opt,
-				     int type, int code, int offset, __u32 info)
+				     int type, int code, int offset, __be32 info)
 {
 	return __udp6_lib_err(skb, opt, type, code, offset, info, udplite_hash);
 }