From nobody Tue May 07 21:42:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VYsFQ2RbSz5K1SY; Tue, 07 May 2024 21:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VYsFQ1Npwz59M6; Tue, 7 May 2024 21:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715118154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PAriXaGA7ulmjuQ/KVHlgbkPp+8BLONJT70qZfctMf0=; b=Bd4mH/GcIDQxw6QF8XLLpctyvj7nip5urj1U1Nv/5DfQx4akh9UKn4/53LTONymXIV/HqD uieEdsIRJLvfKtI5VFtrsTTI0JWGnGqT2XwySbcT4f9geJbMzw3ha/MuK0RxzFV3P4lCbR MD+Svu2mirH/gXi8TpsHnfCb//4X1cr40WkYJ0Mi/neyWy+r2rXb7KGSeXq+MLVUQjctkB 7UDyolE0KaD5QxowSr/5s0t7D9WEvjJczPkwCUNjpDbJ4BgbOb9neo/0FpEt3ZE20fmdlW gEnsUBcjVRwZfbhpAej8CCpkt6jUoGxiH9OKjw7PA6DD8+t0TZjrux9UFcCRhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715118154; a=rsa-sha256; cv=none; b=SVsM2Ty16fy/hDML5p9QDP5ak8gW2+RzodtmsnZd0dxJ8hae/Fgwi+b4xCKSheyAMHt4gJ xgxK6tIiw/dGdpPHjswLgQm7KZ5Cvo+qSr8O3b7hU1FMLyBKBuCWcszBJpAjdt5shhq1Cf VqUKLnruK7q+SmG9FXmgBHPy6jsdHJOgtVM3G+WyItP3CUNIphlp5/E1hc+JGhTxFMwFVK 25bN1VR92kBNAqFM6T/Ne9VesuY/tM0e5t201X6PbASE6RGK5Nrx8CIhSosbCs1AnEUny0 9/M7x7BybvFXP2gANckjilsxO2CHIIGj1taKtwbeXnyc7w0qWs5WN9eRvfP9ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715118154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PAriXaGA7ulmjuQ/KVHlgbkPp+8BLONJT70qZfctMf0=; b=UK0H7qB/J1tIp3Vv7Sqd42RPs9JDFwLAfSgMUp/aFIxHBRHOrkWG7eS9YM+KO6j8aSmJEj awlXQvY5OHiNmiplAvKQL9DyPCQEpHn49kRivd6o+LSVCfjSU939bQCM/ak2pMY2TevPJ8 AX5L762p9RYhyQXCK2ZDbd0FbnyoNL3+ALEBneOLnJ1v5MhULEyPBfifQtMdrc8yuLAE80 MwCAQj2w5gXvE1bm+sJCaLB5W8KZ5BUc9bHwNhqfcGFRZya9I6tWV4pyZue8lWSvHTnqFZ X3J7x2XQM/qIPI67Us3qnCmicXLRKv+iiSvDBIr1omIHi/KFegLV6jFzOmHjUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VYsFQ10X7zyJ1; Tue, 7 May 2024 21:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 447LgYVO023662; Tue, 7 May 2024 21:42:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 447LgYXM023659; Tue, 7 May 2024 21:42:34 GMT (envelope-from git) Date: Tue, 7 May 2024 21:42:34 GMT Message-Id: <202405072142.447LgYXM023659@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b925d7196782 - main - sockets: garbage collect PRCOREQUESTS and stale comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b925d719678210b76adeb105f5f4b41550eb6bb4 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b925d719678210b76adeb105f5f4b41550eb6bb4 commit b925d719678210b76adeb105f5f4b41550eb6bb4 Author: Gleb Smirnoff AuthorDate: 2024-05-07 21:15:49 +0000 Commit: Gleb Smirnoff CommitDate: 2024-05-07 21:15:49 +0000 sockets: garbage collect PRCOREQUESTS and stale comment The code deleted predates FreeBSD history. The comment deleted is 99% outdated. Why KAME decided to use these constants instead of normal ones also lost in centuries. --- sys/netinet6/icmp6.c | 4 ++-- sys/sys/protosw.h | 24 ------------------------ 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index c5e3334eca67..e0f642544327 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2683,7 +2683,7 @@ icmp6_ctloutput(struct socket *so, struct sockopt *sopt) } switch (op) { - case PRCO_SETOPT: + case SOPT_SET: switch (optname) { case ICMP6_FILTER: { @@ -2708,7 +2708,7 @@ icmp6_ctloutput(struct socket *so, struct sockopt *sopt) } break; - case PRCO_GETOPT: + case SOPT_GET: switch (optname) { case ICMP6_FILTER: { diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h index 60d8ffc31362..1d691166929f 100644 --- a/sys/sys/protosw.h +++ b/sys/sys/protosw.h @@ -163,30 +163,6 @@ struct protosw { #define PR_CAPATTACH 0x80 /* socket can attach in cap mode */ #define PR_SOCKBUF 0x100 /* private implementation of buffers */ -/* - * The arguments to ctloutput are: - * (*protosw[].pr_ctloutput)(req, so, level, optname, optval, p); - * req is one of the actions listed below, so is a (struct socket *), - * level is an indication of which protocol layer the option is intended. - * optname is a protocol dependent socket option request, - * optval is a pointer to a mbuf-chain pointer, for value-return results. - * The protocol is responsible for disposal of the mbuf chain *optval - * if supplied, - * the caller is responsible for any space held by *optval, when returned. - * A non-zero return from ctloutput gives an - * UNIX error number which should be passed to higher level software. - */ -#define PRCO_GETOPT 0 -#define PRCO_SETOPT 1 - -#define PRCO_NCMDS 2 - -#ifdef PRCOREQUESTS -char *prcorequests[] = { - "GETOPT", "SETOPT", -}; -#endif - #ifdef _KERNEL struct domain *pffinddomain(int family); struct protosw *pffindproto(int family, int type, int proto);