Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Jul 2024 19:33:28 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 6549718b70f0 - main - nvmfd: Stop setting MAXR2T in association parameters
Message-ID:  <202407251933.46PJXSLw042639@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=6549718b70f0e660a15685369afb4f9caf2215ce

commit 6549718b70f0e660a15685369afb4f9caf2215ce
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-07-25 19:30:52 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-07-25 19:30:52 +0000

    nvmfd: Stop setting MAXR2T in association parameters
    
    This is only used for the host side of an association.  The controller
    obtains this value from the host during connection negotiation.
    
    Sponsored by:   Chelsio Communications
---
 usr.sbin/nvmfd/discovery.c | 1 -
 usr.sbin/nvmfd/io.c        | 1 -
 usr.sbin/nvmfd/nvmfd.8     | 7 +++----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/usr.sbin/nvmfd/discovery.c b/usr.sbin/nvmfd/discovery.c
index 985c77620a62..1cee8755c65c 100644
--- a/usr.sbin/nvmfd/discovery.c
+++ b/usr.sbin/nvmfd/discovery.c
@@ -109,7 +109,6 @@ init_discovery(void)
 	aparams.tcp.pda = 0;
 	aparams.tcp.header_digests = header_digests;
 	aparams.tcp.data_digests = data_digests;
-	aparams.tcp.maxr2t = 1;
 	aparams.tcp.maxh2cdata = 256 * 1024;
 	discovery_na = nvmf_allocate_association(NVMF_TRTYPE_TCP, true,
 	    &aparams);
diff --git a/usr.sbin/nvmfd/io.c b/usr.sbin/nvmfd/io.c
index be845a8ed784..3c25d1944eb8 100644
--- a/usr.sbin/nvmfd/io.c
+++ b/usr.sbin/nvmfd/io.c
@@ -57,7 +57,6 @@ init_io(const char *subnqn)
 	aparams.tcp.pda = 0;
 	aparams.tcp.header_digests = header_digests;
 	aparams.tcp.data_digests = data_digests;
-	aparams.tcp.maxr2t = 1;
 	aparams.tcp.maxh2cdata = 256 * 1024;
 	io_na = nvmf_allocate_association(NVMF_TRTYPE_TCP, true,
 	    &aparams);
diff --git a/usr.sbin/nvmfd/nvmfd.8 b/usr.sbin/nvmfd/nvmfd.8
index 689ac6d4dda1..40b1c0e2ebe0 100644
--- a/usr.sbin/nvmfd/nvmfd.8
+++ b/usr.sbin/nvmfd/nvmfd.8
@@ -3,7 +3,7 @@
 .\"
 .\" Copyright (c) 2024 Chelsio Communications, Inc.
 .\"
-.Dd May 2, 2024
+.Dd July 25, 2024
 .Dt NVMFD 8
 .Os
 .Sh NAME
@@ -120,7 +120,6 @@ The discovery controller and kernel mode functionality of
 should be merged into
 .Xr ctld 8 .
 .Pp
-Additional paramters such as
-.Va MAXR2T ,
-.Va MAXH2CDATA ,
+Additional parameters such as
+.Va MAXH2CDATA
 and queue sizes should be configurable.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407251933.46PJXSLw042639>