ipv6: suppress sparse warnings in IP6_ECN_set_ce()

jmberg-intel · davem330 · commit c15c0ab12fd6 · 2016-08-13T15:08:00.000-07:00
Pass the correct type __wsum to csum_sub() and csum_add(). This doesn't really change anything since __wsum really *is* __be32, but removes the address space warnings from sparse. Cc: Eric Dumazet <edumazet@google.com> Fixes: 34ae6a1 ("ipv6: update skb->csum when CE mark is propagated") Signed-off-by: Johannes Berg <johannes.berg@intel.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/include/net/inet_ecn.h b/include/net/inet_ecn.h
@@ -128,7 +128,8 @@ static inline int IP6_ECN_set_ce(struct sk_buff *skb, struct ipv6hdr *iph)
 	to = from | htonl(INET_ECN_CE << 20);
 	*(__be32 *)iph = to;
 	if (skb->ip_summed == CHECKSUM_COMPLETE)
-		skb->csum = csum_add(csum_sub(skb->csum, from), to);
+		skb->csum = csum_add(csum_sub(skb->csum, (__force __wsum)from),
+				     (__force __wsum)to);
 	return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,8 @@ static inline int IP6_ECN_set_ce(struct sk_buff skb, struct ipv6hdr iph)`
`128`	`128`	`to = from \| htonl(INET_ECN_CE << 20);`
`129`	`129`	`(__be32 )iph = to;`
`130`	`130`	`if (skb->ip_summed == CHECKSUM_COMPLETE)`
`131`		`- skb->csum = csum_add(csum_sub(skb->csum, from), to);`
	`131`	`+ skb->csum = csum_add(csum_sub(skb->csum, (__force __wsum)from),`
	`132`	`+ (__force __wsum)to);`
`132`	`133`	`return 1;`
`133`	`134`	`}`
`134`	`135`