Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netinet6 Remove dead code.



details:   https://anonhg.NetBSD.org/src/rev/8778e8c9832d
branches:  trunk
changeset: 829574:8778e8c9832d
user:      maxv <maxv%NetBSD.org@localhost>
date:      Tue Feb 06 06:32:25 2018 +0000

description:
Remove dead code.

diffstat:

 sys/netinet6/ip6_mroute.c |  16 +++-------------
 sys/netinet6/ip6_mroute.h |   9 +--------
 2 files changed, 4 insertions(+), 21 deletions(-)

diffs (80 lines):

diff -r 7cc2d27aa790 -r 8778e8c9832d sys/netinet6/ip6_mroute.c
--- a/sys/netinet6/ip6_mroute.c Tue Feb 06 06:28:20 2018 +0000
+++ b/sys/netinet6/ip6_mroute.c Tue Feb 06 06:32:25 2018 +0000
@@ -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 @@
                        }
                }
        }
-#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 @@
        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 @@
                }
        }
 
-#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 */
diff -r 7cc2d27aa790 -r 8778e8c9832d sys/netinet6/ip6_mroute.h
--- a/sys/netinet6/ip6_mroute.h Tue Feb 06 06:28:20 2018 +0000
+++ b/sys/netinet6/ip6_mroute.h Tue Feb 06 06:32:25 2018 +0000
@@ -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 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
 };
 
 /*



Home | Main Index | Thread Index | Old Index