[NET]: annotate csum_ipv6_magic() callers in net/*

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>

[NET]: annotate csum_ipv6_magic() callers in net/*
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Al Viro · David S. Miller
1 parent 2bda285315
Showing 9 changed files with 31 additions and 30 deletions Side-by-side Diff
include/net/udp.h
include/net/udplite.h
net/dccp/ipv6.c
net/ipv6/icmp.c
net/ipv6/mcast.c
net/ipv6/netfilter.c
net/ipv6/raw.c
net/ipv6/tcp_ipv6.c
net/ipv6/udp.c
@@ -89,9 +89,9 @@
  * 	@skb: 	sk_buff containing the filled-in UDP header
  * 	        (checksum field must be zeroed out)
  */
-static inline u32 udp_csum_outgoing(struct sock *sk, struct sk_buff *skb)
+static inline __wsum udp_csum_outgoing(struct sock *sk, struct sk_buff *skb)
 {
-	u32 csum = csum_partial(skb->h.raw, sizeof(struct udphdr), 0);
+	__wsum csum = csum_partial(skb->h.raw, sizeof(struct udphdr), 0);
  
 	skb_queue_walk(&sk->sk_write_queue, skb) {
 		csum = csum_add(csum, skb->csum);
@@ -124,10 +124,10 @@
 	return cscov;
 }
  
-static inline u32 udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb)
+static inline __wsum udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb)
 {
-	u32 csum = 0;
 	int off, len, cscov = udplite_sender_cscov(udp_sk(sk), skb->h.uh);
+	__wsum csum = 0;
  
 	skb->ip_summed = CHECKSUM_NONE;     /* no HW support for checksumming */
  
@@ -59,7 +59,7 @@
 }
  
 /* add pseudo-header to DCCP checksum stored in skb->csum */
-static inline u16 dccp_v6_csum_finish(struct sk_buff *skb,
+static inline __sum16 dccp_v6_csum_finish(struct sk_buff *skb,
 				      struct in6_addr *saddr,
 				      struct in6_addr *daddr)
 {
@@ -234,7 +234,7 @@
 						      len, fl->proto,
 						      skb->csum);
 	} else {
-		u32 tmp_csum = 0;
+		__wsum tmp_csum = 0;
  
 		skb_queue_walk(&sk->sk_write_queue, skb) {
 			tmp_csum = csum_add(tmp_csum, skb->csum);
@@ -242,10 +242,10 @@
  
 		tmp_csum = csum_partial((char *)icmp6h,
 					sizeof(struct icmp6hdr), tmp_csum);
-		tmp_csum = csum_ipv6_magic(&fl->fl6_src,
-					   &fl->fl6_dst,
-					   len, fl->proto, tmp_csum);
-		icmp6h->icmp6_cksum = tmp_csum;
+		icmp6h->icmp6_cksum = csum_ipv6_magic(&fl->fl6_src,
+						      &fl->fl6_dst,
+						      len, fl->proto,
+						      tmp_csum);
 	}
 	ip6_push_pending_frames(sk);
 out:
@@ -636,8 +636,8 @@
 			break;
 		/* fall through */
 	case CHECKSUM_NONE:
-		skb->csum = ~csum_ipv6_magic(saddr, daddr, skb->len,
-					     IPPROTO_ICMPV6, 0);
+		skb->csum = ~csum_unfold(csum_ipv6_magic(saddr, daddr, skb->len,
+					     IPPROTO_ICMPV6, 0));
 		if (__skb_checksum_complete(skb)) {
 			LIMIT_NETDEBUG(KERN_DEBUG "ICMPv6 checksum failed [" NIP6_FMT " > " NIP6_FMT "]\n",
 				       NIP6(*saddr), NIP6(*daddr));
@@ -91,7 +91,7 @@
 struct mld2_report {
 	__u8	type;
 	__u8	resv1;
-	__u16	csum;
+	__sum16	csum;
 	__be16	resv2;
 	__be16	ngrec;
 	struct mld2_grec grec[0];
@@ -100,7 +100,7 @@
 struct mld2_query {
 	__u8 type;
 	__u8 code;
-	__u16 csum;
+	__sum16 csum;
 	__be16 mrc;
 	__be16 resv1;
 	struct in6_addr mca;
@@ -100,12 +100,13 @@
 		}
 		/* fall through */
 	case CHECKSUM_NONE:
-		skb->csum = ~csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
+		skb->csum = ~csum_unfold(
+				csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
 					     skb->len - dataoff,
 					     protocol,
 					     csum_sub(0,
 						      skb_checksum(skb, 0,
-							           dataoff, 0)));
+							           dataoff, 0))));
 		csum = __skb_checksum_complete(skb);
 	}
 	return csum;
@@ -370,9 +370,9 @@
 			skb->ip_summed = CHECKSUM_UNNECESSARY;
 	}
 	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
-		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, inet->num, 0);
+					     skb->len, inet->num, 0));
  
 	if (inet->hdrincl) {
 		if (skb_checksum_complete(skb)) {
@@ -479,8 +479,8 @@
 	int offset;
 	int len;
 	int total_len;
-	u32 tmp_csum;
-	u16 csum;
+	__wsum tmp_csum;
+	__sum16 csum;
  
 	if (!rp->checksum)
 		goto send;
  
@@ -532,14 +532,13 @@
 	if (unlikely(csum))
 		tmp_csum = csum_sub(tmp_csum, csum);
  
-	tmp_csum = csum_ipv6_magic(&fl->fl6_src,
+	csum = csum_ipv6_magic(&fl->fl6_src,
 				   &fl->fl6_dst,
 				   total_len, fl->proto, tmp_csum);
  
 	if (tmp_csum == 0 && fl->proto == IPPROTO_UDP)
 		tmp_csum = -1;
  
-	csum = tmp_csum;
 	if (skb_store_bits(skb, offset, &csum, 2))
 		BUG();
  
@@ -105,10 +105,10 @@
 	}
 }
  
-static __inline__ u16 tcp_v6_check(struct tcphdr *th, int len,
+static __inline__ __sum16 tcp_v6_check(struct tcphdr *th, int len,
 				   struct in6_addr *saddr, 
 				   struct in6_addr *daddr, 
-				   unsigned long base)
+				   __wsum base)
 {
 	return csum_ipv6_magic(saddr, daddr, len, IPPROTO_TCP, base);
 }
@@ -1537,8 +1537,8 @@
 		}
 	}
  
-	skb->csum = ~tcp_v6_check(skb->h.th,skb->len,&skb->nh.ipv6h->saddr,
-				  &skb->nh.ipv6h->daddr, 0);
+	skb->csum = ~csum_unfold(tcp_v6_check(skb->h.th,skb->len,&skb->nh.ipv6h->saddr,
+				  &skb->nh.ipv6h->daddr, 0));
  
 	if (skb->len <= 76) {
 		return __skb_checksum_complete(skb);
@@ -383,9 +383,10 @@
 		skb->ip_summed = CHECKSUM_UNNECESSARY;
  
 	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
-		skb->csum = ~csum_ipv6_magic(&skb->nh.ipv6h->saddr,
-					     &skb->nh.ipv6h->daddr,
-					     skb->len, IPPROTO_UDP, 0);
+		skb->csum = ~csum_unfold(csum_ipv6_magic(&skb->nh.ipv6h->saddr,
+							 &skb->nh.ipv6h->daddr,
+							 ulen, IPPROTO_UDP,
+							 0));
  
 	return (UDP_SKB_CB(skb)->partial_cov = 0);
 }
@@ -511,7 +512,7 @@
 	struct inet_sock *inet = inet_sk(sk);
 	struct flowi *fl = &inet->cork.fl;
 	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)
...	...	@@ -89,9 +89,9 @@
89	89	* @skb: sk_buff containing the filled-in UDP header
90	90	* (checksum field must be zeroed out)
91	91	*/
92		-static inline u32 udp_csum_outgoing(struct sock sk, struct sk_buff skb)
	92	+static inline __wsum udp_csum_outgoing(struct sock sk, struct sk_buff skb)
93	93	{
94		- u32 csum = csum_partial(skb->h.raw, sizeof(struct udphdr), 0);
	94	+ __wsum csum = csum_partial(skb->h.raw, sizeof(struct udphdr), 0);
95	95
96	96	skb_queue_walk(&sk->sk_write_queue, skb) {
97	97	csum = csum_add(csum, skb->csum);
...	...	@@ -124,10 +124,10 @@
124	124	return cscov;
125	125	}
126	126
127		-static inline u32 udplite_csum_outgoing(struct sock sk, struct sk_buff skb)
	127	+static inline __wsum udplite_csum_outgoing(struct sock sk, struct sk_buff skb)
128	128	{
129		- u32 csum = 0;
130	129	int off, len, cscov = udplite_sender_cscov(udp_sk(sk), skb->h.uh);
	130	+ __wsum csum = 0;
131	131
132	132	skb->ip_summed = CHECKSUM_NONE; /* no HW support for checksumming */
133	133
...	...	@@ -59,7 +59,7 @@
59	59	}
60	60
61	61	/* add pseudo-header to DCCP checksum stored in skb->csum */
62		-static inline u16 dccp_v6_csum_finish(struct sk_buff *skb,
	62	+static inline __sum16 dccp_v6_csum_finish(struct sk_buff *skb,
63	63	struct in6_addr *saddr,
64	64	struct in6_addr *daddr)
65	65	{
...	...	@@ -234,7 +234,7 @@
234	234	len, fl->proto,
235	235	skb->csum);
236	236	} else {
237		- u32 tmp_csum = 0;
	237	+ __wsum tmp_csum = 0;
238	238
239	239	skb_queue_walk(&sk->sk_write_queue, skb) {
240	240	tmp_csum = csum_add(tmp_csum, skb->csum);
...	...	@@ -242,10 +242,10 @@
242	242
243	243	tmp_csum = csum_partial((char *)icmp6h,
244	244	sizeof(struct icmp6hdr), tmp_csum);
245		- tmp_csum = csum_ipv6_magic(&fl->fl6_src,
246		- &fl->fl6_dst,
247		- len, fl->proto, tmp_csum);
248		- icmp6h->icmp6_cksum = tmp_csum;
	245	+ icmp6h->icmp6_cksum = csum_ipv6_magic(&fl->fl6_src,
	246	+ &fl->fl6_dst,
	247	+ len, fl->proto,
	248	+ tmp_csum);
249	249	}
250	250	ip6_push_pending_frames(sk);
251	251	out:
...	...	@@ -636,8 +636,8 @@
636	636	break;
637	637	/* fall through */
638	638	case CHECKSUM_NONE:
639		- skb->csum = ~csum_ipv6_magic(saddr, daddr, skb->len,
640		- IPPROTO_ICMPV6, 0);
	639	+ skb->csum = ~csum_unfold(csum_ipv6_magic(saddr, daddr, skb->len,
	640	+ IPPROTO_ICMPV6, 0));
641	641	if (__skb_checksum_complete(skb)) {
642	642	LIMIT_NETDEBUG(KERN_DEBUG "ICMPv6 checksum failed [" NIP6_FMT " > " NIP6_FMT "]\n",
643	643	NIP6(saddr), NIP6(daddr));
...	...	@@ -91,7 +91,7 @@
91	91	struct mld2_report {
92	92	__u8 type;
93	93	__u8 resv1;
94		- __u16 csum;
	94	+ __sum16 csum;
95	95	__be16 resv2;
96	96	__be16 ngrec;
97	97	struct mld2_grec grec[0];
...	...	@@ -100,7 +100,7 @@
100	100	struct mld2_query {
101	101	__u8 type;
102	102	__u8 code;
103		- __u16 csum;
	103	+ __sum16 csum;
104	104	__be16 mrc;
105	105	__be16 resv1;
106	106	struct in6_addr mca;
...	...	@@ -100,12 +100,13 @@
100	100	}
101	101	/* fall through */
102	102	case CHECKSUM_NONE:
103		- skb->csum = ~csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
	103	+ skb->csum = ~csum_unfold(
	104	+ csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
104	105	skb->len - dataoff,
105	106	protocol,
106	107	csum_sub(0,
107	108	skb_checksum(skb, 0,
108		- dataoff, 0)));
	109	+ dataoff, 0))));
109	110	csum = __skb_checksum_complete(skb);
110	111	}
111	112	return csum;
...	...	@@ -370,9 +370,9 @@
370	370	skb->ip_summed = CHECKSUM_UNNECESSARY;
371	371	}
372	372	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
373		- skb->csum = ~csum_ipv6_magic(&skb->nh.ipv6h->saddr,
	373	+ skb->csum = ~csum_unfold(csum_ipv6_magic(&skb->nh.ipv6h->saddr,
374	374	&skb->nh.ipv6h->daddr,
375		- skb->len, inet->num, 0);
	375	+ skb->len, inet->num, 0));
376	376
377	377	if (inet->hdrincl) {
378	378	if (skb_checksum_complete(skb)) {
...	...	@@ -479,8 +479,8 @@
479	479	int offset;
480	480	int len;
481	481	int total_len;
482		- u32 tmp_csum;
483		- u16 csum;
	482	+ __wsum tmp_csum;
	483	+ __sum16 csum;
484	484
485	485	if (!rp->checksum)
486	486	goto send;
487	487
...	...	@@ -532,14 +532,13 @@
532	532	if (unlikely(csum))
533	533	tmp_csum = csum_sub(tmp_csum, csum);
534	534
535		- tmp_csum = csum_ipv6_magic(&fl->fl6_src,
	535	+ csum = csum_ipv6_magic(&fl->fl6_src,
536	536	&fl->fl6_dst,
537	537	total_len, fl->proto, tmp_csum);
538	538
539	539	if (tmp_csum == 0 && fl->proto == IPPROTO_UDP)
540	540	tmp_csum = -1;
541	541
542		- csum = tmp_csum;
543	542	if (skb_store_bits(skb, offset, &csum, 2))
544	543	BUG();
545	544
...	...	@@ -105,10 +105,10 @@
105	105	}
106	106	}
107	107
108		-static __inline__ u16 tcp_v6_check(struct tcphdr *th, int len,
	108	+static __inline__ __sum16 tcp_v6_check(struct tcphdr *th, int len,
109	109	struct in6_addr *saddr,
110	110	struct in6_addr *daddr,
111		- unsigned long base)
	111	+ __wsum base)
112	112	{
113	113	return csum_ipv6_magic(saddr, daddr, len, IPPROTO_TCP, base);
114	114	}
...	...	@@ -1537,8 +1537,8 @@
1537	1537	}
1538	1538	}
1539	1539
1540		- skb->csum = ~tcp_v6_check(skb->h.th,skb->len,&skb->nh.ipv6h->saddr,
1541		- &skb->nh.ipv6h->daddr, 0);
	1540	+ skb->csum = ~csum_unfold(tcp_v6_check(skb->h.th,skb->len,&skb->nh.ipv6h->saddr,
	1541	+ &skb->nh.ipv6h->daddr, 0));
1542	1542
1543	1543	if (skb->len <= 76) {
1544	1544	return __skb_checksum_complete(skb);
...	...	@@ -383,9 +383,10 @@
383	383	skb->ip_summed = CHECKSUM_UNNECESSARY;
384	384
385	385	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
386		- skb->csum = ~csum_ipv6_magic(&skb->nh.ipv6h->saddr,
387		- &skb->nh.ipv6h->daddr,
388		- skb->len, IPPROTO_UDP, 0);
	386	+ skb->csum = ~csum_unfold(csum_ipv6_magic(&skb->nh.ipv6h->saddr,
	387	+ &skb->nh.ipv6h->daddr,
	388	+ ulen, IPPROTO_UDP,
	389	+ 0));
389	390
390	391	return (UDP_SKB_CB(skb)->partial_cov = 0);
391	392	}
...	...	@@ -511,7 +512,7 @@
511	512	struct inet_sock *inet = inet_sk(sk);
512	513	struct flowi *fl = &inet->cork.fl;
513	514	int err = 0;
514		- u32 csum = 0;
	515	+ __wsum csum = 0;
515	516
516	517	/* Grab the skbuff where UDP header space exists. */
517	518	if ((skb = skb_peek(&sk->sk_write_queue)) == NULL)