svn commit: r249543 - head/sys/netinet6
Tijl Coosemans
tijl at coosemans.org
Tue Apr 16 12:52:57 UTC 2013
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
>
> Log:
> Replace hardcoded numbers.
>
> Modified:
> head/sys/netinet6/ip6_var.h
>
> Modified: head/sys/netinet6/ip6_var.h
> ==============================================================================
> --- 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 = # 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];
>
> /* 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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20130416/a08254ee/attachment.sig>
More information about the svn-src-head
mailing list