Author: ae
Date: Wed Jun 13 07:14:34 2018
New Revision: 335031
URL: https://svnweb.freebsd.org/changeset/base/335031
Log:
MFC r334324:
Remove empty encap_init() function.
Modified:
stable/11/sys/netinet/in_proto.c
stable/11/sys/netinet/ip_encap.c
stable/11/sys/netinet/ip_encap.h
stable/11/sys/netinet6/in6_proto.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/netinet/in_proto.c
==============================================================================
--- stable/11/sys/netinet/in_proto.c Wed Jun 13 07:02:58 2018
(r335030)
+++ stable/11/sys/netinet/in_proto.c Wed Jun 13 07:14:34 2018
(r335031)
@@ -225,7 +225,6 @@ struct protosw inetsw[] = {
.pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
.pr_input = encap4_input,
.pr_ctloutput = rip_ctloutput,
- .pr_init = encap_init,
.pr_usrreqs = &rip_usrreqs
},
{
@@ -235,7 +234,6 @@ struct protosw inetsw[] = {
.pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
.pr_input = encap4_input,
.pr_ctloutput = rip_ctloutput,
- .pr_init = encap_init,
.pr_usrreqs = &rip_usrreqs
},
{
@@ -245,7 +243,6 @@ struct protosw inetsw[] = {
.pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
.pr_input = encap4_input,
.pr_ctloutput = rip_ctloutput,
- .pr_init = encap_init,
.pr_usrreqs = &rip_usrreqs
},
{
@@ -255,7 +252,6 @@ struct protosw inetsw[] = {
.pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
.pr_input = encap4_input,
.pr_ctloutput = rip_ctloutput,
- .pr_init = encap_init,
.pr_usrreqs = &rip_usrreqs
},
# ifdef INET6
@@ -266,7 +262,6 @@ struct protosw inetsw[] = {
.pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
.pr_input = encap4_input,
.pr_ctloutput = rip_ctloutput,
- .pr_init = encap_init,
.pr_usrreqs = &rip_usrreqs
},
#endif
Modified: stable/11/sys/netinet/ip_encap.c
==============================================================================
--- stable/11/sys/netinet/ip_encap.c Wed Jun 13 07:02:58 2018
(r335030)
+++ stable/11/sys/netinet/ip_encap.c Wed Jun 13 07:14:34 2018
(r335031)
@@ -106,15 +106,6 @@ static struct mtx encapmtx;
MTX_SYSINIT(encapmtx, &encapmtx, "encapmtx", MTX_DEF);
static LIST_HEAD(, encaptab) encaptab = LIST_HEAD_INITIALIZER(encaptab);
-/*
- * We currently keey encap_init() for source code compatibility reasons --
- * it's referenced by KAME pieces in netinet6.
- */
-void
-encap_init(void)
-{
-}
-
#ifdef INET
int
encap4_input(struct mbuf **mp, int *offp, int proto)
Modified: stable/11/sys/netinet/ip_encap.h
==============================================================================
--- stable/11/sys/netinet/ip_encap.h Wed Jun 13 07:02:58 2018
(r335030)
+++ stable/11/sys/netinet/ip_encap.h Wed Jun 13 07:14:34 2018
(r335031)
@@ -48,7 +48,6 @@ struct encaptab {
void *arg; /* passed via m->m_pkthdr.aux */
};
-void encap_init(void);
int encap4_input(struct mbuf **, int *, int);
int encap6_input(struct mbuf **, int *, int);
const struct encaptab *encap_attach(int, int, const struct sockaddr *,
Modified: stable/11/sys/netinet6/in6_proto.c
==============================================================================
--- stable/11/sys/netinet6/in6_proto.c Wed Jun 13 07:02:58 2018
(r335030)
+++ stable/11/sys/netinet6/in6_proto.c Wed Jun 13 07:14:34 2018
(r335031)
@@ -280,7 +280,6 @@ struct protosw inet6sw[] = {
.pr_input = encap6_input,
.pr_output = rip6_output,
.pr_ctloutput = rip6_ctloutput,
- .pr_init = encap_init,
.pr_usrreqs = &rip6_usrreqs
},
#endif /* INET */
@@ -292,7 +291,6 @@ struct protosw inet6sw[] = {
.pr_input = encap6_input,
.pr_output = rip6_output,
.pr_ctloutput = rip6_ctloutput,
- .pr_init = encap_init,
.pr_usrreqs = &rip6_usrreqs
},
{
@@ -303,7 +301,6 @@ struct protosw inet6sw[] = {
.pr_input = encap6_input,
.pr_output = rip6_output,
.pr_ctloutput = rip6_ctloutput,
- .pr_init = encap_init,
.pr_usrreqs = &rip6_usrreqs
},
{
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
