From owner-svn-src-all@freebsd.org Sat Oct 8 17:47:45 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE3A5C06330; Sat, 8 Oct 2016 17:47:45 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 683C22D9; Sat, 8 Oct 2016 17:47:45 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id sviqbAdi4FfiXsvirbxD7E; Sat, 08 Oct 2016 11:47:45 -0600 X-Authority-Analysis: v=2.2 cv=Qb8khYTv c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=CH0kA5CcgfcA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=gucpz7pfEu6Z0tN-OdUA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id E9F28C28; Sat, 8 Oct 2016 10:47:43 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id u98HlhML006540; Sat, 8 Oct 2016 10:47:43 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201610081747.u98HlhML006540@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Kevin Lo cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r306849 - head/sys/contrib/ipfilter/netinet In-Reply-To: Message from Kevin Lo of "Sat, 08 Oct 2016 14:57:21 -0000." <201610081457.u98EvLfA019100@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 08 Oct 2016 10:47:43 -0700 X-CMAE-Envelope: MS4wfDrV3hB3W2w9OFVir6ixBQYXvArtVcNl+2gZ5l/obeYDQR3/modZUCU6jLGshKWCtYYZr9nsDAgqZ8jdVujp5JVWe1ms3CHJmYBTGY4zxP4DU9MvIBYl /wdP5zMYye+QwtEWivZljpEpfCNnPpXUha9KzUALrLLWsPrvBxfR7kCR98LKJwbLJ6xRvU8E51k0UuFaMFUTI/7/pDHN127lw1f6zgO3HQDYLvUKx0t/gISu TuiL6al2ktXDF1FtOFqR2Caq3y6FUx8W/ow1K1ZemJKkpDP4RUYGzGy1sH/u8Lrc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Sat, 08 Oct 2016 17:47:45 -0000 In message <201610081457.u98EvLfA019100@repo.freebsd.org>, Kevin Lo writes: > Author: kevlo > Date: Sat Oct 8 14:57:21 2016 > New Revision: 306849 > URL: https://svnweb.freebsd.org/changeset/base/306849 > > Log: > In case of removal of m_copy() the macro should remain named M_COPY() > in ip_compat.h after r305824. Leaving as vanilla as possible aids in > future maintenance and upgrades. > > Suggested by: glebius, cy > > Modified: > head/sys/contrib/ipfilter/netinet/fil.c > head/sys/contrib/ipfilter/netinet/ip_compat.h > > Modified: head/sys/contrib/ipfilter/netinet/fil.c > ============================================================================= > = > --- head/sys/contrib/ipfilter/netinet/fil.c Sat Oct 8 14:32:43 2016 > (r306848) > +++ head/sys/contrib/ipfilter/netinet/fil.c Sat Oct 8 14:57:21 2016 > (r306849) > @@ -3226,7 +3226,7 @@ filterdone: > fdp = fin->fin_dif; > if ((fdp != NULL) && (fdp->fd_ptr != NULL) && > (fdp->fd_ptr != (void *)-1)) { > - mc = M_COPYM(fin->fin_m); > + mc = M_COPY(fin->fin_m); > if (mc != NULL) > ipf_fastroute(mc, &mc, fin, fdp); > } > > Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h > ============================================================================= > = > --- head/sys/contrib/ipfilter/netinet/ip_compat.h Sat Oct 8 14:32:43 201 > 6 (r306848) > +++ head/sys/contrib/ipfilter/netinet/ip_compat.h Sat Oct 8 14:57:21 201 > 6 (r306849) > @@ -212,7 +212,7 @@ struct ether_addr { > # define MSGDSIZE(m) mbufchainlen(m) > # define M_LEN(m) (m)->m_len > # define M_ADJ(m,x) m_adj(m, x) > -# define M_COPYM(x) m_copym((x), 0, M_COPYALL, M_NOWAIT) > +# define M_COPY(x) m_copym((x), 0, M_COPYALL, M_NOWAIT) > # define M_DUP(m) m_dup(m, M_NOWAIT) > # define IPF_PANIC(x,y) if (x) { printf y; panic("ipf_panic"); } > typedef struct mbuf mb_t; > @@ -367,7 +367,7 @@ typedef struct mb_s { > # define MSGDSIZE(m) msgdsize(m) > # define M_LEN(m) (m)->mb_len > # define M_ADJ(m,x) (m)->mb_len += x > -# define M_COPYM(m) dupmbt(m) > +# define M_COPY(m) dupmbt(m) > # define M_DUP(m) dupmbt(m) > # define GETKTIME(x) gettimeofday((struct timeval *)(x), NULL) > # define MTOD(m, t) ((t)(m)->mb_data) > > Thank you Kevin. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.