public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: Laurent Vivier <lvivier@redhat.com>
To: passt-dev@passt.top
Cc: Laurent Vivier <lvivier@redhat.com>
Subject: [PATCH 3/8] tcp: extract buffer management from tcp_conn_tap_mss()
Date: Mon, 27 May 2024 11:10:25 +0200	[thread overview]
Message-ID: <20240527091030.772228-4-lvivier@redhat.com> (raw)
In-Reply-To: <20240527091030.772228-1-lvivier@redhat.com>

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 tcp.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tcp.c b/tcp.c
index b42cef69e8db..85a11e7e05dc 100644
--- a/tcp.c
+++ b/tcp.c
@@ -1808,6 +1808,14 @@ static int tcp_conn_new_sock(const struct ctx *c, sa_family_t af)
 	return s;
 }
 
+static uint16_t tcp_buf_conn_tap_mss(const struct tcp_tap_conn *conn)
+{
+	if (CONN_V4(conn))
+		return MSS4;
+
+	return MSS6;
+}
+
 /**
  * tcp_conn_sock() - Obtain a connectable socket in the host/init namespace
  * @c:		Execution context
@@ -1853,10 +1861,7 @@ static uint16_t tcp_conn_tap_mss(const struct tcp_tap_conn *conn,
 	else
 		mss = ret;
 
-	if (CONN_V4(conn))
-		mss = MIN(MSS4, mss);
-	else
-		mss = MIN(MSS6, mss);
+	mss = MIN(tcp_buf_conn_tap_mss(conn), mss);
 
 	return MIN(mss, USHRT_MAX);
 }
-- 
@@ -1808,6 +1808,14 @@ static int tcp_conn_new_sock(const struct ctx *c, sa_family_t af)
 	return s;
 }
 
+static uint16_t tcp_buf_conn_tap_mss(const struct tcp_tap_conn *conn)
+{
+	if (CONN_V4(conn))
+		return MSS4;
+
+	return MSS6;
+}
+
 /**
  * tcp_conn_sock() - Obtain a connectable socket in the host/init namespace
  * @c:		Execution context
@@ -1853,10 +1861,7 @@ static uint16_t tcp_conn_tap_mss(const struct tcp_tap_conn *conn,
 	else
 		mss = ret;
 
-	if (CONN_V4(conn))
-		mss = MIN(MSS4, mss);
-	else
-		mss = MIN(MSS6, mss);
+	mss = MIN(tcp_buf_conn_tap_mss(conn), mss);
 
 	return MIN(mss, USHRT_MAX);
 }
-- 
2.44.0


  parent reply	other threads:[~2024-05-27  9:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-27  9:10 [PATCH 0/8] Add vhost-user support to passt (part 2) Laurent Vivier
2024-05-27  9:10 ` [PATCH 1/8] tcp: inline tcp_l2_buf_fill_headers() Laurent Vivier
2024-05-27  9:10 ` [PATCH 2/8] tcp: extract buffer management from tcp_send_flag() Laurent Vivier
2024-05-27  9:10 ` Laurent Vivier [this message]
2024-05-27  9:10 ` [PATCH 4/8] tcp: move buffers management functions to their own file Laurent Vivier
2024-05-27  9:10 ` [PATCH 5/8] tap: export pool_flush()/tapX_handler()/packet_add() Laurent Vivier
2024-05-27  9:10 ` [PATCH 6/8] udp: move udpX_l2_buf_t and udpX_l2_mh_sock out of udp_update_hdrX() Laurent Vivier
2024-05-27  9:10 ` [PATCH 7/8] udp: rename udp_sock_handler() to udp_buf_sock_handler() Laurent Vivier
2024-05-27  9:10 ` [PATCH 8/8] vhost-user: compare mode MODE_PASTA and not MODE_PASST Laurent Vivier

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=20240527091030.772228-4-lvivier@redhat.com \
    --to=lvivier@redhat.com \
    --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).