Remove sysctl for divert6 recv and send space.

UDP has a common sysctl for recv and send space, but divert had a
special knob for inet6.  Remove net.inet6.divert.recvspace and
net.inet6.divert.sendspace sysctl and use the net.inet.divert values
instead.

OK dlg@ mvs@

Author: bluhm

sys/netinet/ip_divert.h

@@ -1,4 +1,4 @@
-/*      $OpenBSD: ip_divert.h,v 1.28 2025/06/06 13:13:37 bluhm Exp $ */
+/*      $OpenBSD: ip_divert.h,v 1.29 2025/06/18 17:45:07 bluhm Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <[email protected]>
@@ -67,8 +67,9 @@ divstat_inc(enum divstat_counters c)
 	counters_inc(divcounters, c);
 }
 
-extern struct	inpcbtable	divbtable;
-
+extern u_int divert_sendspace;
+extern u_int divert_recvspace;
+extern struct inpcbtable divbtable;
 extern const struct pr_usrreqs divert_usrreqs;
 
 void	 divert_init(void);

sys/netinet6/ip6_divert.c

@@ -1,4 +1,4 @@
-/*      $OpenBSD: ip6_divert.c,v 1.104 2025/06/06 13:13:37 bluhm Exp $ */
+/*      $OpenBSD: ip6_divert.c,v 1.105 2025/06/18 17:45:07 bluhm Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <[email protected]>
@@ -52,14 +52,6 @@
 struct	inpcbtable	divb6table;
 struct	cpumem		*div6counters;
 
-u_int   divert6_sendspace = DIVERT_SENDSPACE;	/* [a] */
-u_int   divert6_recvspace = DIVERT_RECVSPACE;	/* [a] */
-
-const struct sysctl_bounded_args divert6ctl_vars[] = {
-	{ DIVERT6CTL_RECVSPACE, &divert6_recvspace, 0, SB_MAX },
-	{ DIVERT6CTL_SENDSPACE, &divert6_sendspace, 0, SB_MAX },
-};
-
 const struct pr_usrreqs divert6_usrreqs = {
 	.pru_attach	= divert6_attach,
 	.pru_detach	= divert_detach,
@@ -267,8 +259,8 @@ divert6_attach(struct socket *so, int proto, int wait)
 	if ((so->so_state & SS_PRIV) == 0)
 		return EACCES;
 
-	error = soreserve(so, atomic_load_int(&divert6_sendspace),
-	    atomic_load_int(&divert6_recvspace));
+	error = soreserve(so, atomic_load_int(&divert_sendspace),
+	    atomic_load_int(&divert_recvspace));
 	if (error)
 		return (error);
 	error = in_pcballoc(so, &divb6table, wait);
@@ -304,9 +296,7 @@ divert6_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
 		return (divert_sysctl_divstat(div6counters, oldp, oldlenp,
 		    newp));
 	default:
-		return (sysctl_bounded_arr(divert6ctl_vars,
-		    nitems(divert6ctl_vars), name, namelen, oldp, oldlenp,
-		    newp, newlen));
+		return (EOPNOTSUPP);
 	}
 	/* NOTREACHED */
 }

sys/netinet6/ip6_divert.h

@@ -1,4 +1,4 @@
-/*      $OpenBSD: ip6_divert.h,v 1.24 2025/06/04 12:37:00 bluhm Exp $ */
+/*      $OpenBSD: ip6_divert.h,v 1.25 2025/06/18 17:45:07 bluhm Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <[email protected]>
@@ -29,8 +29,8 @@
 
 #define	DIVERT6CTL_NAMES { \
 	{ 0, 0 }, \
-	{ "recvspace",	CTLTYPE_INT }, \
-	{ "sendspace",	CTLTYPE_INT }, \
+	{ NULL,	0 }, \
+	{ NULL,	0 }, \
 	{ "stats",	CTLTYPE_STRUCT } \
 }