Module Name: src
Committed By: maxv
Date: Tue Feb 6 06:32:26 UTC 2018
Modified Files:
src/sys/netinet6: ip6_mroute.c ip6_mroute.h
Log Message:
Remove dead code.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/netinet6/ip6_mroute.c
cvs rdiff -u -r1.17 -r1.18 src/sys/netinet6/ip6_mroute.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/ip6_mroute.c
diff -u src/sys/netinet6/ip6_mroute.c:1.121 src/sys/netinet6/ip6_mroute.c:1.122
--- src/sys/netinet6/ip6_mroute.c:1.121 Fri Feb 2 09:01:17 2018
+++ src/sys/netinet6/ip6_mroute.c Tue Feb 6 06:32:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_mroute.c,v 1.121 2018/02/02 09:01:17 maxv Exp $ */
+/* $NetBSD: ip6_mroute.c,v 1.122 2018/02/06 06:32:25 maxv Exp $ */
/* $KAME: ip6_mroute.c,v 1.49 2001/07/25 09:21:18 jinmei Exp $ */
/*
@@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.121 2018/02/02 09:01:17 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.122 2018/02/06 06:32:25 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -550,10 +550,7 @@ ip6_mrouter_done(void)
}
}
}
-#ifdef notyet
- memset((void *)qtable, 0, sizeof(qtable));
- memset((void *)tbftable, 0, sizeof(tbftable));
-#endif
+
memset((void *)mif6table, 0, sizeof(mif6table));
nummifs = 0;
@@ -649,9 +646,6 @@ add_m6if(struct mif6ctl *mifcp)
struct ifnet *ifp;
struct sockaddr_in6 sin6;
int error, s;
-#ifdef notyet
- struct tbf *m_tbf = tbftable + mifcp->mif6c_mifi;
-#endif
if (mifcp->mif6c_mifi >= MAXMIFS)
return EINVAL;
@@ -754,10 +748,6 @@ del_m6if(mifi_t *mifip)
}
}
-#ifdef notyet
- memset((void *)qtable[*mifip], 0, sizeof(qtable[*mifip]));
- memset((void *)mifp->m6_tbf, 0, sizeof(*(mifp->m6_tbf)));
-#endif
memset((void *)mifp, 0, sizeof (*mifp));
/* Adjust nummifs down */
Index: src/sys/netinet6/ip6_mroute.h
diff -u src/sys/netinet6/ip6_mroute.h:1.17 src/sys/netinet6/ip6_mroute.h:1.18
--- src/sys/netinet6/ip6_mroute.h:1.17 Wed Mar 18 17:06:52 2009
+++ src/sys/netinet6/ip6_mroute.h Tue Feb 6 06:32:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_mroute.h,v 1.17 2009/03/18 17:06:52 cegger Exp $ */
+/* $NetBSD: ip6_mroute.h,v 1.18 2018/02/06 06:32:25 maxv Exp $ */
/* $KAME: ip6_mroute.h,v 1.17 2001/02/10 02:05:52 itojun Exp $ */
/*
@@ -209,19 +209,12 @@ struct sioc_mif_req6 {
struct mif6 {
u_char m6_flags; /* MIFF_ flags defined above */
u_int m6_rate_limit; /* max rate */
-#ifdef notyet
- struct tbf *m6_tbf; /* token bucket structure at intf. */
-#endif
struct in6_addr m6_lcl_addr; /* local interface address */
struct ifnet *m6_ifp; /* pointer to interface */
u_quad_t m6_pkt_in; /* # pkts in on interface */
u_quad_t m6_pkt_out; /* # pkts out on interface */
u_quad_t m6_bytes_in; /* # bytes in on interface */
u_quad_t m6_bytes_out; /* # bytes out on interface */
-#ifdef notyet
- u_int m6_rsvp_on; /* RSVP listening on this vif */
- struct socket *m6_rsvpd; /* RSVP daemon socket */
-#endif
};
/*
