[PATCH v2 6/6] udp: Use existing helper for UDP checksum on inbound IPv6 packets

[David Gibson <david@gibson.dropbear.id.au>]

Currently we open code the calculation of the UDP checksum in
udp_update_hdr6().  We calling a helper to handle the IPv6 pseudo-header,
and preset the checksum field to 0 so an uninitialised value doesn't get
folded in.  We already have a helper to do this: csum_udp6() which we use
in some slow paths.  Use it here as well.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 udp.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/udp.c b/udp.c
index fe3a6cd8..45b7cc96 100644
--- a/udp.c
+++ b/udp.c
@@ -671,10 +671,7 @@ static size_t udp_update_hdr6(const struct ctx *c, struct udp6_l2_buf_t *b,
 	b->uh.source = b->s_in6.sin6_port;
 	b->uh.dest = htons(dstport);
 	b->uh.len = b->ip6h.payload_len;
-	b->uh.check = 0;
-	b->uh.check = csum(&b->uh, payload_len,
-			   proto_ipv6_header_psum(payload_len, IPPROTO_UDP,
-						  src, dst));
+	csum_udp6(&b->uh, src, dst, b->data, datalen);
 
 	return tap_iov_len(c, &b->taph, payload_len + sizeof(b->ip6h));
 }
-- 
@@ -671,10 +671,7 @@ static size_t udp_update_hdr6(const struct ctx *c, struct udp6_l2_buf_t *b,
 	b->uh.source = b->s_in6.sin6_port;
 	b->uh.dest = htons(dstport);
 	b->uh.len = b->ip6h.payload_len;
-	b->uh.check = 0;
-	b->uh.check = csum(&b->uh, payload_len,
-			   proto_ipv6_header_psum(payload_len, IPPROTO_UDP,
-						  src, dst));
+	csum_udp6(&b->uh, src, dst, b->data, datalen);
 
 	return tap_iov_len(c, &b->taph, payload_len + sizeof(b->ip6h));
 }
-- 
2.44.0