From: Stefano Brivio <sbrivio@redhat.com>
To: passt-dev@passt.top
Cc: Laurent Vivier <lvivier@redhat.com>,
David Gibson <david@gibson.dropbear.id.au>,
omni <omni+alpine@hack.org>
Subject: [PATCH v2] tcp: Fix build against musl, __sum16 comes from linux/types.h
Date: Thu, 31 Oct 2024 08:14:32 +0100 [thread overview]
Message-ID: <20241031071432.536227-1-sbrivio@redhat.com> (raw)
Use a plain uint16_t instead and avoid including one extra header:
the 'bitwise' attribute of __sum16 is just used by sparse(1).
Reported-by: omni <omni+alpine@hack.org>
Fixes: 3d484aa37090 ("tcp: Update TCP checksum using an iovec array")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
v2: Use uint16_t instead of including linux/types.h
tcp.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tcp.c b/tcp.c
index 4e0a17e..56ceba6 100644
--- a/tcp.c
+++ b/tcp.c
@@ -766,7 +766,7 @@ static void tcp_update_check_tcp4(const struct iphdr *iph,
struct in_addr saddr = { .s_addr = iph->saddr };
struct in_addr daddr = { .s_addr = iph->daddr };
size_t check_ofs;
- __sum16 *check;
+ uint16_t *check;
int check_idx;
uint32_t sum;
char *ptr;
@@ -797,7 +797,7 @@ static void tcp_update_check_tcp4(const struct iphdr *iph,
return;
}
- check = (__sum16 *)ptr;
+ check = (uint16_t *)ptr;
*check = 0;
*check = csum_iov(iov, iov_cnt, l4offset, sum);
@@ -816,7 +816,7 @@ static void tcp_update_check_tcp6(const struct ipv6hdr *ip6h,
{
uint16_t l4len = ntohs(ip6h->payload_len);
size_t check_ofs;
- __sum16 *check;
+ uint16_t *check;
int check_idx;
uint32_t sum;
char *ptr;
@@ -848,7 +848,7 @@ static void tcp_update_check_tcp6(const struct ipv6hdr *ip6h,
return;
}
- check = (__sum16 *)ptr;
+ check = (uint16_t *)ptr;
*check = 0;
*check = csum_iov(iov, iov_cnt, l4offset, sum);
--
@@ -766,7 +766,7 @@ static void tcp_update_check_tcp4(const struct iphdr *iph,
struct in_addr saddr = { .s_addr = iph->saddr };
struct in_addr daddr = { .s_addr = iph->daddr };
size_t check_ofs;
- __sum16 *check;
+ uint16_t *check;
int check_idx;
uint32_t sum;
char *ptr;
@@ -797,7 +797,7 @@ static void tcp_update_check_tcp4(const struct iphdr *iph,
return;
}
- check = (__sum16 *)ptr;
+ check = (uint16_t *)ptr;
*check = 0;
*check = csum_iov(iov, iov_cnt, l4offset, sum);
@@ -816,7 +816,7 @@ static void tcp_update_check_tcp6(const struct ipv6hdr *ip6h,
{
uint16_t l4len = ntohs(ip6h->payload_len);
size_t check_ofs;
- __sum16 *check;
+ uint16_t *check;
int check_idx;
uint32_t sum;
char *ptr;
@@ -848,7 +848,7 @@ static void tcp_update_check_tcp6(const struct ipv6hdr *ip6h,
return;
}
- check = (__sum16 *)ptr;
+ check = (uint16_t *)ptr;
*check = 0;
*check = csum_iov(iov, iov_cnt, l4offset, sum);
--
2.43.0
next reply other threads:[~2024-10-31 7:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-31 7:14 Stefano Brivio [this message]
2024-11-02 3:29 ` [PATCH v2] tcp: Fix build against musl, __sum16 comes from linux/types.h David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241031071432.536227-1-sbrivio@redhat.com \
--to=sbrivio@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=lvivier@redhat.com \
--cc=omni+alpine@hack.org \
--cc=passt-dev@passt.top \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).