From owner-svn-src-all@FreeBSD.ORG Sun Nov 9 17:02:34 2014 Return-Path: Delivered-To: svn-src-all@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 CFADD14B; Sun, 9 Nov 2014 17:02:34 +0000 (UTC) Received: from mail.ipfw.ru (mail.ipfw.ru [IPv6:2a01:4f8:120:6141::2]) (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 9144DE12; Sun, 9 Nov 2014 17:02:34 +0000 (UTC) Received: from [2a02:6b8:0:401:222:4dff:fe50:cd2f] (helo=ptichko.yndx.net) by mail.ipfw.ru with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128) (Exim 4.82 (FreeBSD)) (envelope-from ) id 1XnRs6-000EZQ-Ba; Sun, 09 Nov 2014 16:45:34 +0400 Message-ID: <545F9D90.1000901@FreeBSD.org> Date: Sun, 09 Nov 2014 21:00:00 +0400 From: "Alexander V. Chernikov" User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.1.2 MIME-Version: 1.0 To: Konstantin Belousov Subject: Re: svn commit: r274315 - in head/sys/netpfil: ipfw pf References: <201411091615.sA9GFTL6052510@svn.freebsd.org> <20141109162927.GA53947@kib.kiev.ua> In-Reply-To: <20141109162927.GA53947@kib.kiev.ua> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Nov 2014 17:02:34 -0000 On 09.11.2014 20:29, Konstantin Belousov wrote: > 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 ? No. Fixed in r274320, thank you! > >> -#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