Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Oct 2021 18:17:57 GMT
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: d89c820b0da1 - main - Remove div_ctlinput().
Message-ID:  <202110251817.19PIHvuF058430@gitrepo.freebsd.org>

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

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

commit d89c820b0da17992d4ccd8a075c1b81382cef1a9
Author:     Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2021-10-22 23:21:10 +0000
Commit:     Gleb Smirnoff <glebius@FreeBSD.org>
CommitDate: 2021-10-25 18:16:49 +0000

    Remove div_ctlinput().
    
    This function does nothing since 97d8d152c28b. It was introduced
    in 252f24a2cf40 with a sidenote "may not be needed".
    
    Reviewed by:            donner
    Differential Revision:  https://reviews.freebsd.org/D32608
---
 sys/netinet/ip_divert.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 4141386a6a2d..c30550b1c4db 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -687,18 +687,6 @@ div_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
 	return div_output(so, m, (struct sockaddr_in *)nam, control);
 }
 
-static void
-div_ctlinput(int cmd, struct sockaddr *sa, void *vip)
-{
-        struct in_addr faddr;
-
-	faddr = ((struct sockaddr_in *)sa)->sin_addr;
-	if (sa->sa_family != AF_INET || faddr.s_addr == INADDR_ANY)
-        	return;
-	if (PRC_IS_REDIRECT(cmd))
-		return;
-}
-
 static int
 div_pcblist(SYSCTL_HANDLER_ARGS)
 {
@@ -791,7 +779,6 @@ struct protosw div_protosw = {
 	.pr_protocol =		IPPROTO_DIVERT,
 	.pr_flags =		PR_ATOMIC|PR_ADDR,
 	.pr_input =		div_input,
-	.pr_ctlinput =		div_ctlinput,
 	.pr_ctloutput =		ip_ctloutput,
 	.pr_init =		div_init,
 	.pr_usrreqs =		&div_usrreqs



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