From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v9 13/20] tcp: Use only netinet/tcp.h instead of linux/tcp.h
Date: Mon, 4 Nov 2024 19:39:56 +1100 [thread overview]
Message-ID: <20241104084004.3544294-14-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20241104084004.3544294-1-david@gibson.dropbear.id.au>
We used to use linux/tcp.h instead of the (somewhat) standard netinet/tcp.h
because we needed the Linux specific extensions for TCP_INFO. Since
13f0291e "tcp: Remove compile-time dependency on struct tcp_info version"
we're dealing with that in a different way. However tcp_buf.c and tcp_vu.c
still used linux/tcp.h. Change it to netinet/tcp.h.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
tcp_buf.c | 3 +--
tcp_vu.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/tcp_buf.c b/tcp_buf.c
index 274e313..d17ba48 100644
--- a/tcp_buf.c
+++ b/tcp_buf.c
@@ -19,8 +19,7 @@
#include <errno.h>
#include <netinet/ip.h>
-
-#include <linux/tcp.h>
+#include <netinet/tcp.h>
#include "util.h"
#include "ip.h"
diff --git a/tcp_vu.c b/tcp_vu.c
index b994817..c10a269 100644
--- a/tcp_vu.c
+++ b/tcp_vu.c
@@ -10,10 +10,10 @@
#include <stdint.h>
#include <netinet/ip.h>
+#include <netinet/tcp.h>
#include <sys/socket.h>
-#include <linux/tcp.h>
#include <linux/virtio_net.h>
#include "util.h"
--
@@ -10,10 +10,10 @@
#include <stdint.h>
#include <netinet/ip.h>
+#include <netinet/tcp.h>
#include <sys/socket.h>
-#include <linux/tcp.h>
#include <linux/virtio_net.h>
#include "util.h"
--
2.47.0
next prev parent reply other threads:[~2024-11-04 8:40 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-04 8:39 [PATCH v9 00/20] (RFC) Add vhost-user support to passt. (part 3) David Gibson
2024-11-04 8:39 ` [PATCH v9 01/20] packet: replace struct desc by struct iovec David Gibson
2024-11-04 8:39 ` [PATCH v9 02/20] vhost-user: introduce virtio API David Gibson
2024-11-04 8:39 ` [PATCH v9 03/20] vhost-user: introduce vhost-user API David Gibson
2024-11-04 8:39 ` [PATCH v9 04/20] udp: Prepare udp.c to be shared with vhost-user David Gibson
2024-11-04 8:39 ` [PATCH v9 05/20] tcp: Export headers functions David Gibson
2024-11-04 8:39 ` [PATCH v9 06/20] passt: rename tap_sock_init() to tap_backend_init() David Gibson
2024-11-04 8:39 ` [PATCH v9 07/20] vhost-user: add vhost-user David Gibson
2024-11-04 8:39 ` [PATCH v9 08/20] test: Add tests for passt in vhost-user mode David Gibson
2024-11-04 8:39 ` [PATCH v9 09/20] vhost-user: Fix some trivial errors in comments David Gibson
2024-11-04 8:39 ` [PATCH v9 10/20] isolation: Abort if mode is not set David Gibson
2024-11-04 8:39 ` [PATCH v9 11/20] vhost-user: Consistent sense when encoding IP version as boolean David Gibson
2024-11-04 8:39 ` [PATCH v9 12/20] test: Fix trivial errors in two_guests_vu tests David Gibson
2024-11-04 8:39 ` David Gibson [this message]
2024-11-04 8:39 ` [PATCH v9 14/20] tcp_vu: Share more header construction between IPv4 and IPv6 paths David Gibson
2024-11-04 8:39 ` [PATCH v9 15/20] tcp: Move tcp_l2_buf_fill_headers() to tcp_buf.c David Gibson
2024-11-04 8:39 ` [PATCH v9 16/20] tcp: Adjust iov_len before filling headers David Gibson
2024-11-04 8:40 ` [PATCH v9 17/20] tcp: Pass TCP header and payload separately to tcp_update_check_tcp[46]() David Gibson
2024-11-04 8:40 ` [PATCH v9 18/20] tcp: Pass TCP header and payload separately to tcp_fill_headers[46]() David Gibson
2024-11-04 8:40 ` [PATCH v9 19/20] tcp: Merge tcp_update_check_tcp[46]() David Gibson
2024-11-04 8:40 ` [PATCH v9 20/20] tcp: Merge tcp_fill_headers[46]() with each other David Gibson
2024-11-04 9:18 ` [PATCH v9 00/20] (RFC) Add vhost-user support to passt. (part 3) Stefano Brivio
2024-11-04 9:59 ` David Gibson
2024-11-05 1:10 ` 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=20241104084004.3544294-14-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/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).