From d3eb0d7b59f6a1f3e78efc04c44e1c700b907332 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 8 Mar 2024 17:53:25 +1100 Subject: tap: Rename tap_iov_{base,len} These two functions are typically used to calculate values to go into the iov_base and iov_len fields of a struct iovec. They don't have to be used for that, though. Rename them in terms of what they actually do: calculate the base address and total length of the complete frame, including both L2 and tap specific headers. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- udp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'udp.c') diff --git a/udp.c b/udp.c index cba595c..0a7f3b7 100644 --- a/udp.c +++ b/udp.c @@ -318,7 +318,7 @@ static void udp_sock4_iov_init_one(const struct ctx *c, size_t i) mh->msg_iov = siov; mh->msg_iovlen = 1; - tiov->iov_base = tap_iov_base(c, &buf->taph); + tiov->iov_base = tap_frame_base(c, &buf->taph); } /** @@ -346,7 +346,7 @@ static void udp_sock6_iov_init_one(const struct ctx *c, size_t i) mh->msg_iov = siov; mh->msg_iovlen = 1; - tiov->iov_base = tap_iov_base(c, &buf->taph); + tiov->iov_base = tap_frame_base(c, &buf->taph); } /** @@ -606,7 +606,7 @@ static size_t udp_update_hdr4(const struct ctx *c, struct udp4_l2_buf_t *b, b->uh.dest = htons(dstport); b->uh.len = htons(datalen + sizeof(b->uh)); - return tap_iov_len(c, &b->taph, ip_len); + return tap_frame_len(c, &b->taph, ip_len); } /** @@ -673,7 +673,7 @@ static size_t udp_update_hdr6(const struct ctx *c, struct udp6_l2_buf_t *b, b->uh.len = b->ip6h.payload_len; csum_udp6(&b->uh, src, dst, b->data, datalen); - return tap_iov_len(c, &b->taph, payload_len + sizeof(b->ip6h)); + return tap_frame_len(c, &b->taph, payload_len + sizeof(b->ip6h)); } /** -- cgit v1.2.3