Date: Tue, 15 Oct 2013 10:09:33 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r256515 - head/sys/netinet6 Message-ID: <201310151009.r9FA9XjI092283@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Tue Oct 15 10:09:33 2013 New Revision: 256515 URL: http://svnweb.freebsd.org/changeset/base/256515 Log: Now counter_u64_t is known to userland, thus remove hack from r253086. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: head/sys/netinet6/in6_var.h Modified: head/sys/netinet6/in6_var.h ============================================================================== --- head/sys/netinet6/in6_var.h Tue Oct 15 10:05:37 2013 (r256514) +++ head/sys/netinet6/in6_var.h Tue Oct 15 10:09:33 2013 (r256515) @@ -65,6 +65,7 @@ #define _NETINET6_IN6_VAR_H_ #include <sys/tree.h> +#include <sys/counter.h> #ifdef _KERNEL #include <sys/fnv_hash.h> @@ -98,9 +99,6 @@ struct scope6_id; struct lltable; struct mld_ifinfo; -#ifdef _KERNEL -#include <sys/counter.h> - struct in6_ifextra { counter_u64_t *in6_ifstat; counter_u64_t *icmp6_ifstat; @@ -109,17 +107,6 @@ struct in6_ifextra { struct lltable *lltable; struct mld_ifinfo *mld_ifinfo; }; -#else - -struct in6_ifextra { - void *in6_ifstat; - void *icmp6_ifstat; - struct nd_ifinfo *nd_ifinfo; - struct scope6_id *scope6_id; - struct lltable *lltable; - struct mld_ifinfo *mld_ifinfo; -}; -#endif /* !_KERNEL */ #define LLTABLE6(ifp) (((struct in6_ifextra *)(ifp)->if_afdata[AF_INET6])->lltable)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310151009.r9FA9XjI092283>