From owner-svn-src-head@FreeBSD.ORG Sun Nov 9 16:29:33 2014 Return-Path: Delivered-To: svn-src-head@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 C6F7A66B; Sun, 9 Nov 2014 16:29:33 +0000 (UTC) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A47EB04; Sun, 9 Nov 2014 16:29:33 +0000 (UTC) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id sA9GTRCX054337 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 9 Nov 2014 18:29:27 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua sA9GTRCX054337 Received: (from kostik@localhost) by tom.home (8.14.9/8.14.9/Submit) id sA9GTRtX054336; Sun, 9 Nov 2014 18:29:27 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 9 Nov 2014 18:29:27 +0200 From: Konstantin Belousov To: "Alexander V. Chernikov" Subject: Re: svn commit: r274315 - in head/sys/netpfil: ipfw pf Message-ID: <20141109162927.GA53947@kib.kiev.ua> References: <201411091615.sA9GFTL6052510@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201411091615.sA9GFTL6052510@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Nov 2014 16:29:33 -0000 On Sun, Nov 09, 2014 at 04:15:29PM +0000, Alexander V. Chernikov wrote: > Author: melifaro > Date: Sun Nov 9 16:15:28 2014 > New Revision: 274315 > URL: https://svnweb.freebsd.org/changeset/base/274315 > > Log: > Remove unused 'struct route' fields. > > Modified: > head/sys/netpfil/ipfw/ip_fw_private.h > head/sys/netpfil/pf/pf.c > > Modified: head/sys/netpfil/ipfw/ip_fw_private.h > ============================================================================== > --- head/sys/netpfil/ipfw/ip_fw_private.h Sun Nov 9 15:53:29 2014 (r274314) > +++ head/sys/netpfil/ipfw/ip_fw_private.h Sun Nov 9 16:15:28 2014 (r274315) > @@ -66,14 +66,12 @@ enum { > */ > struct _ip6dn_args { > struct ip6_pktopts *opt_or; > - struct route_in6 ro_or; > int flags_or; > struct ip6_moptions *im6o_or; > struct ifnet *origifp_or; > struct ifnet *ifp_or; > struct sockaddr_in6 dst_or; > u_long mtu_or; > - struct route_in6 ro_pmtu_or; > }; > > > > Modified: head/sys/netpfil/pf/pf.c > ============================================================================== > --- head/sys/netpfil/pf/pf.c Sun Nov 9 15:53:29 2014 (r274314) > +++ head/sys/netpfil/pf/pf.c Sun Nov 9 16:15:28 2014 (r274315) > @@ -140,14 +140,12 @@ struct pf_send_entry { > PFSE_ICMP6, > } pfse_type; > union { > - struct route ro; > struct { > int type; > int code; > int mtu; > } icmpopts; > } u; There is a single member of union u now. Is the union needed still ? > -#define pfse_ro u.ro > #define pfse_icmp_type u.icmpopts.type > #define pfse_icmp_code u.icmpopts.code > #define pfse_icmp_mtu u.icmpopts.mtu