From owner-svn-src-all@FreeBSD.ORG Tue Apr 16 12:52:57 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7E76A812; Tue, 16 Apr 2013 12:52:57 +0000 (UTC) (envelope-from tijl@coosemans.org) Received: from mailrelay011.isp.belgacom.be (mailrelay011.isp.belgacom.be [195.238.6.178]) by mx1.freebsd.org (Postfix) with ESMTP id 94442943; Tue, 16 Apr 2013 12:52:56 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AoYGAJ9IbVFR8ZLu/2dsb2JhbABQgwY2gzG9VYELF3SCHwEBBSMzIxALFAQJIQICDwIoHgYNAQcBAYgUCKl/gkCQR45+EQeCL4ETA49UgSmHK49xgw06 Received: from 238.146-241-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.241.146.238]) by relay.skynet.be with ESMTP; 16 Apr 2013 14:52:49 +0200 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.6/8.14.6) with ESMTP id r3GCqldt005028; Tue, 16 Apr 2013 14:52:48 +0200 (CEST) (envelope-from tijl@coosemans.org) Message-ID: <516D4998.20905@coosemans.org> Date: Tue, 16 Apr 2013 14:52:40 +0200 From: Tijl Coosemans User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:17.0) Gecko/20130408 Thunderbird/17.0.5 MIME-Version: 1.0 To: "Andrey V. Elsukov" Subject: Re: svn commit: r249543 - head/sys/netinet6 References: <201304161112.r3GBCx2n018725@svn.freebsd.org> In-Reply-To: <201304161112.r3GBCx2n018725@svn.freebsd.org> X-Enigmail-Version: 1.5.1 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="----enig2EJBPDPFSKQOOUETWFMRC" 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.14 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: Tue, 16 Apr 2013 12:52:57 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2EJBPDPFSKQOOUETWFMRC Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 2013-04-16 13:12, Andrey V. Elsukov wrote: > Author: ae > Date: Tue Apr 16 11:12:58 2013 > New Revision: 249543 > URL: http://svnweb.freebsd.org/changeset/base/249543 >=20 > Log: > Replace hardcoded numbers. >=20 > Modified: > head/sys/netinet6/ip6_var.h >=20 > Modified: head/sys/netinet6/ip6_var.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet6/ip6_var.h Tue Apr 16 08:54:50 2013 (r249542) > +++ head/sys/netinet6/ip6_var.h Tue Apr 16 11:12:58 2013 (r249543) > @@ -204,9 +204,11 @@ struct ip6stat { > u_quad_t ip6s_rawout; /* total raw ip packets generated */ > u_quad_t ip6s_badscope; /* scope error */ > u_quad_t ip6s_notmember; /* don't join this multicast group */ > - u_quad_t ip6s_nxthist[256]; /* next header history */ > +#define IP6S_HDRCNT 256 /* headers count */ > + u_quad_t ip6s_nxthist[IP6S_HDRCNT]; /* next header history */ > u_quad_t ip6s_m1; /* one mbuf */ > - u_quad_t ip6s_m2m[32]; /* two or more mbuf */ > +#define IP6S_M2MMAX 32 > + u_quad_t ip6s_m2m[IP6S_M2MMAX]; /* two or more mbuf */ > u_quad_t ip6s_mext1; /* one ext mbuf */ > u_quad_t ip6s_mext2m; /* two or more ext mbuf */ > u_quad_t ip6s_exthdrtoolong; /* ext hdr are not contiguous */ > @@ -218,27 +220,29 @@ struct ip6stat { > * algorithm: > * XXX: hardcoded 16 =3D # of ip6 multicast scope types + 1 > */ > +#define IP6S_RULESMAX 16 > +#define IP6S_SCOPECNT 16 > /* number of times that address selection fails */ > u_quad_t ip6s_sources_none; > /* number of times that an address on the outgoing I/F is chosen */ > - u_quad_t ip6s_sources_sameif[16]; > + u_quad_t ip6s_sources_sameif[IP6S_SCOPECNT]; > /* number of times that an address on a non-outgoing I/F is chosen */= > - u_quad_t ip6s_sources_otherif[16]; > + u_quad_t ip6s_sources_otherif[IP6S_SCOPECNT]; > /* > * number of times that an address that has the same scope > * from the destination is chosen. > */ > - u_quad_t ip6s_sources_samescope[16]; > + u_quad_t ip6s_sources_samescope[IP6S_SCOPECNT]; > /* > * number of times that an address that has a different scope > * from the destination is chosen. > */ > - u_quad_t ip6s_sources_otherscope[16]; > + u_quad_t ip6s_sources_otherscope[IP6S_SCOPECNT]; > /* number of times that a deprecated address is chosen */ > - u_quad_t ip6s_sources_deprecated[16]; > + u_quad_t ip6s_sources_deprecated[IP6S_SCOPECNT]; > =20 > /* number of times that each rule of source selection is applied. */ > - u_quad_t ip6s_sources_rule[16]; > + u_quad_t ip6s_sources_rule[IP6S_MAXRULES]; This breaks buildworld because IP6S_MAXRULES is undefined. It's called IP6S_RULESMAX above. ------enig2EJBPDPFSKQOOUETWFMRC Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iF4EAREIAAYFAlFtSZ8ACgkQfoCS2CCgtit5RwD+I+RxLgMTUwVHdwlK2NnlC2pc QQ1pOuOtO5UeVDbKdEwA/iU6V1qMCLLRBqud7THISIol9yksUqjmDgKtnogvdKul =s47v -----END PGP SIGNATURE----- ------enig2EJBPDPFSKQOOUETWFMRC--