This one was an omission from the earlier conversion, should be an easy
OK?
>From 1ea2565b9414fddc1227781348101e5d9c37a913 Mon Sep 17 00:00:00 2001
From: Greg Steuck
Date: Sun, 1 Nov 2020 19:05:14 -0800
Subject: [PATCH 1/3] Move TCPCTL_ALWAYS_KEEPALIVE into tcpctl_vars
---
sys/netinet/tcp_usrreq.c | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git sys/netinet/tcp_usrreq.c sys/netinet/tcp_usrreq.c
index 7b0aaac7bac..0da0827f407 100644
--- sys/netinet/tcp_usrreq.c
+++ sys/netinet/tcp_usrreq.c
@@ -125,6 +125,7 @@ const struct sysctl_bounded_args tcpctl_vars[] = {
{ TCPCTL_SYN_CACHE_LIMIT, _syn_cache_limit, 1, 1000 * 1000 },
{ TCPCTL_SYN_BUCKET_LIMIT, _syn_bucket_limit, 1, INT_MAX },
{ TCPCTL_RFC3390, _do_rfc3390, 0, 2 },
+ { TCPCTL_ALWAYS_KEEPALIVE, _always_keepalive, 0, 1 },
};
struct inpcbtable tcbtable;
@@ -1027,13 +1028,6 @@ tcp_sysctl(int *name, u_int namelen, void *oldp, size_t
*oldlenp, void *newp,
NET_UNLOCK();
return (error);
- case TCPCTL_ALWAYS_KEEPALIVE:
- NET_LOCK();
- error = sysctl_int(oldp, oldlenp, newp, newlen,
- _always_keepalive);
- NET_UNLOCK();
- return (error);
-
case TCPCTL_REASS_LIMIT:
NET_LOCK();
nval = tcp_reass_limit;
--
2.29.1
