Kill raw_ctlinput() this function is INCOMPLETE since rev 1.1 and is not

needed. All callers using the protosw pr_ctlinput pointer do a NULL check
before so there is no need to provide the function.

5 files changed, 8 insertions, 19 deletions

diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index 61a92a860fe..a7ac6bf5ce2 100644
--- a/sys/kern/uipc_proto.c
+++ b/sys/kern/uipc_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_proto.c,v 1.8 2015/07/18 15:00:01 guenther Exp $	*/
+/*	$OpenBSD: uipc_proto.c,v 1.9 2016/09/05 15:12:29 claudio Exp $	*/
 /*	$NetBSD: uipc_proto.c,v 1.8 1996/02/13 21:10:47 christos Exp $	*/
 
 /*-
@@ -65,7 +65,7 @@ struct protosw unixsw[] = {
   0,		0,		0,		0,
 },
 { 0,		0,		0,		0,
-  raw_input,	0,		raw_ctlinput,	0,
+  raw_input,	0,		0,		0,
   raw_usrreq,
   raw_init,	0,		0,		0,
 }
diff --git a/sys/net/pfkey.c b/sys/net/pfkey.c
index f4b8e7608e9..22a1e652179 100644
--- a/sys/net/pfkey.c
+++ b/sys/net/pfkey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfkey.c,v 1.30 2016/08/15 11:35:25 dlg Exp $	*/
+/*	$OpenBSD: pfkey.c,v 1.31 2016/09/05 15:12:30 claudio Exp $	*/
 
 /*
  *	@(#)COPYRIGHT	1.1 (NRL) 17 January 1995
@@ -278,7 +278,7 @@ static struct protosw pfkey_protosw_template = {
 	PR_ATOMIC | PR_ADDR,
 	(void *) raw_input,
 	(void *) pfkey_output,
-	(void *) raw_ctlinput,
+	NULL, /* ctlinput */
 	NULL, /* ctloutput */
 	pfkey_usrreq,
 	NULL, /* init */
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index e5102887e5c..c39ded3fd28 100644
--- a/sys/net/raw_cb.h
+++ b/sys/net/raw_cb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raw_cb.h,v 1.9 2013/10/24 18:50:16 deraadt Exp $	*/
+/*	$OpenBSD: raw_cb.h,v 1.10 2016/09/05 15:12:30 claudio Exp $	*/
 /*	$NetBSD: raw_cb.h,v 1.9 1996/02/13 22:00:41 christos Exp $	*/
 
 /*
@@ -59,7 +59,6 @@ extern LIST_HEAD(rawcbhead, rawcb) rawcb;		/* head of list */
 
 #define	sotorawcb(so)		((struct rawcb *)(so)->so_pcb)
 int	 raw_attach(struct socket *, int);
-void	 *raw_ctlinput(int, struct sockaddr *, u_int, void *);
 void	 raw_detach(struct rawcb *);
 void	 raw_disconnect(struct rawcb *);
 void	 raw_init(void);
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 3171b31b59c..ab264d47c99 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raw_usrreq.c,v 1.22 2015/12/05 10:07:55 tedu Exp $	*/
+/*	$OpenBSD: raw_usrreq.c,v 1.23 2016/09/05 15:12:30 claudio Exp $	*/
 /*	$NetBSD: raw_usrreq.c,v 1.11 1996/02/13 22:00:43 christos Exp $	*/
 
 /*
@@ -131,16 +131,6 @@ raw_input(struct mbuf *m0, ...)
 		m_freem(m);
 }
 
-void *
-raw_ctlinput(int cmd, struct sockaddr *arg, u_int rdomain, void *d)
-{
-
-	if (cmd < 0 || cmd >= PRC_NCMDS)
-		return NULL;
-	return NULL;
-	/* INCOMPLETE */
-}
-
 int
 raw_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
     struct mbuf *control, struct proc *p)
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 06a34255ad9..fbcf89230bb 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsock.c,v 1.202 2016/09/04 09:39:01 claudio Exp $	*/
+/*	$OpenBSD: rtsock.c,v 1.203 2016/09/05 15:12:30 claudio Exp $	*/
 /*	$NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $	*/
 
 /*
@@ -1591,7 +1591,7 @@ extern	struct domain routedomain;		/* or at least forward */
 
 struct protosw routesw[] = {
 { SOCK_RAW,	&routedomain,	0,		PR_ATOMIC|PR_ADDR|PR_WANTRCVD,
-  route_input,	route_output,	raw_ctlinput,	route_ctloutput,
+  route_input,	route_output,	0,		route_ctloutput,
   route_usrreq,
   raw_init,	0,		0,		0,
   sysctl_rtable,