From owner-svn-src-projects@FreeBSD.ORG Sun Nov 9 00:43:15 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 4F214876; Sun, 9 Nov 2014 00:43:15 +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 3B8692E2; Sun, 9 Nov 2014 00:43:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA90hF2l034979; Sun, 9 Nov 2014 00:43:15 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA90hEPM034977; Sun, 9 Nov 2014 00:43:14 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411090043.sA90hEPM034977@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sun, 9 Nov 2014 00:43:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274302 - projects/routing/sys/net 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: Sun, 09 Nov 2014 00:43:15 -0000 Author: melifaro Date: Sun Nov 9 00:43:14 2014 New Revision: 274302 URL: https://svnweb.freebsd.org/changeset/base/274302 Log: Remove unused fields from old radix_node_head. Modified: projects/routing/sys/net/radix.h projects/routing/sys/net/radix_mpath.c Modified: projects/routing/sys/net/radix.h ============================================================================== --- projects/routing/sys/net/radix.h Sun Nov 9 00:36:39 2014 (r274301) +++ projects/routing/sys/net/radix.h Sun Nov 9 00:43:14 2014 (r274302) @@ -128,8 +128,6 @@ struct radix_head { struct radix_node_head { struct radix_head rh; - u_int rnh_gen; /* generation counter */ - int rnh_multipath; /* multipath capable ? */ rn_matchaddr_f_t *rnh_matchaddr; /* longest match for sockaddr */ rn_addaddr_f_t *rnh_addaddr; /* add based on sockaddr*/ rn_deladdr_f_t *rnh_deladdr; /* remove based on sockaddr */ Modified: projects/routing/sys/net/radix_mpath.c ============================================================================== --- projects/routing/sys/net/radix_mpath.c Sun Nov 9 00:36:39 2014 (r274301) +++ projects/routing/sys/net/radix_mpath.c Sun Nov 9 00:43:14 2014 (r274302) @@ -61,7 +61,7 @@ int rn_mpath_capable(struct radix_node_head *rnh) { - return rnh->rnh_multipath; + return 0; } struct radix_node * @@ -270,7 +270,6 @@ rn4_mpath_inithead(void **head, int off) hashjitter = arc4random(); if (in_inithead(head, off) == 1) { rnh = (struct radix_node_head *)*head; - rnh->rnh_multipath = 1; return 1; } else return 0; @@ -286,7 +285,6 @@ rn6_mpath_inithead(void **head, int off) hashjitter = arc4random(); if (in6_inithead(head, off) == 1) { rnh = (struct radix_node_head *)*head; - rnh->rnh_multipath = 1; return 1; } else return 0;