From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 16:31:12 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1F232B20; Sat, 8 Nov 2014 16:31:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E6847119; Sat, 8 Nov 2014 16:31:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8GVBTH004443; Sat, 8 Nov 2014 16:31:11 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8GVB0I004442; Sat, 8 Nov 2014 16:31:11 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411081631.sA8GVB0I004442@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 8 Nov 2014 16:31:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274293 - projects/routing/sys/netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 16:31:12 -0000 Author: melifaro Date: Sat Nov 8 16:31:11 2014 New Revision: 274293 URL: https://svnweb.freebsd.org/changeset/base/274293 Log: Finish r274290#2: remove unused IPv6 code. Modified: projects/routing/sys/netinet6/in6_rmx.c Modified: projects/routing/sys/netinet6/in6_rmx.c ============================================================================== --- projects/routing/sys/netinet6/in6_rmx.c Sat Nov 8 16:26:17 2014 (r274292) +++ projects/routing/sys/netinet6/in6_rmx.c Sat Nov 8 16:31:11 2014 (r274293) @@ -170,22 +170,12 @@ in6_addroute(void *v_arg, void *n_arg, s return (ret); } -SYSCTL_DECL(_net_inet6_ip6); - -static VNET_DEFINE(int, rtq_toomany6) = 128; - /* 128 cached routes is ``too many'' */ -#define V_rtq_toomany6 VNET(rtq_toomany6) -SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_RTMAXCACHE, rtmaxcache, CTLFLAG_RW, - &VNET_NAME(rtq_toomany6) , 0, ""); - struct rtqk_arg { struct radix_node_head *rnh; int mode; - int updating; int draining; int killed; int found; - time_t nextstop; }; /* @@ -193,7 +183,6 @@ struct rtqk_arg { */ struct mtuex_arg { struct radix_node_head *rnh; - time_t nextstop; }; static VNET_DEFINE(struct callout, rtq_mtutimer); #define V_rtq_mtutimer VNET(rtq_mtutimer) @@ -202,7 +191,6 @@ static int in6_mtuexpire(struct radix_node *rn, void *rock) { struct rtentry *rt = (struct rtentry *)rn; - struct mtuex_arg *ap = rock; /* sanity */ if (!rt) @@ -211,8 +199,6 @@ in6_mtuexpire(struct radix_node *rn, voi if (rt->rt_expire && !(rt->rt_flags & RTF_PROBEMTU)) { if (rt->rt_expire <= time_uptime) { rt->rt_flags |= RTF_PROBEMTU; - } else { - ap->nextstop = lmin(ap->nextstop, rt->rt_expire); } } @@ -227,7 +213,6 @@ in6_mtutimo_one(struct radix_node_head * struct mtuex_arg arg; arg.rnh = rnh; - arg.nextstop = time_uptime + MTUTIMO_DEFAULT; RADIX_NODE_HEAD_LOCK(rnh); rnh->rnh_walktree(rnh, in6_mtuexpire, &arg); RADIX_NODE_HEAD_UNLOCK(rnh);