This an "oops" moment... The code remained correct, but I forgot to
remove junk after converting it.

>From 68a12efd641c4fc5f75ac693bf7ed7487948e0dd Mon Sep 17 00:00:00 2001
From: Greg Steuck <[email protected]>
Date: Sat, 14 Nov 2020 16:12:50 -0800
Subject: [PATCH 2/3] Remove the cases folded into sysctl_bounded_args but left
 behind

divert_sysctl and divert6_sysctl get a tiny bit slimmer.
---
 sys/netinet/ip_divert.c   | 12 ------------
 sys/netinet6/ip6_divert.c | 12 ------------
 2 files changed, 24 deletions(-)

diff --git sys/netinet/ip_divert.c sys/netinet/ip_divert.c
index 47716da5887..f1174fae2c7 100644
--- sys/netinet/ip_divert.c
+++ sys/netinet/ip_divert.c
@@ -379,18 +379,6 @@ divert_sysctl(int *name, u_int namelen, void *oldp, size_t 
*oldlenp, void *newp,
                return (ENOTDIR);
 
        switch (name[0]) {
-       case DIVERTCTL_SENDSPACE:
-               NET_LOCK();
-               error = sysctl_int(oldp, oldlenp, newp, newlen,
-                   &divert_sendspace);
-               NET_UNLOCK();
-               return (error);
-       case DIVERTCTL_RECVSPACE:
-               NET_LOCK();
-               error = sysctl_int(oldp, oldlenp, newp, newlen,
-                   &divert_recvspace);
-               NET_UNLOCK();
-               return (error);
        case DIVERTCTL_STATS:
                return (divert_sysctl_divstat(oldp, oldlenp, newp));
        default:
diff --git sys/netinet6/ip6_divert.c sys/netinet6/ip6_divert.c
index 5d071a9a764..fa02dc1b1ec 100644
--- sys/netinet6/ip6_divert.c
+++ sys/netinet6/ip6_divert.c
@@ -385,18 +385,6 @@ divert6_sysctl(int *name, u_int namelen, void *oldp, 
size_t *oldlenp,
                return (ENOTDIR);
 
        switch (name[0]) {
-       case DIVERT6CTL_SENDSPACE:
-               NET_LOCK();
-               error = sysctl_int(oldp, oldlenp, newp, newlen,
-                   &divert6_sendspace);
-               NET_UNLOCK();
-               return (error);
-       case DIVERT6CTL_RECVSPACE:
-               NET_LOCK();
-               error = sysctl_int(oldp, oldlenp, newp, newlen,
-                   &divert6_recvspace);
-               NET_UNLOCK();
-               return (error);
        case DIVERT6CTL_STATS:
                return (divert6_sysctl_div6stat(oldp, oldlenp, newp));
        default:
-- 
2.29.2

Reply via email to