summaryrefslogtreecommitdiffstats
path: root/sys/netinet6
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2013-10-15 10:09:33 +0000
committerglebius <glebius@FreeBSD.org>2013-10-15 10:09:33 +0000
commit8f84b8adaa86f1ef7350e24660e4132e8cc986c8 (patch)
treecd309922b2e0f723994e0030a2c04efc5f4b6a66 /sys/netinet6
parent53ef73d870b78df97a3f597b30905161c71b8793 (diff)
downloadFreeBSD-src-8f84b8adaa86f1ef7350e24660e4132e8cc986c8.zip
FreeBSD-src-8f84b8adaa86f1ef7350e24660e4132e8cc986c8.tar.gz
Now counter_u64_t is known to userland, thus remove hack from r253086.
Sponsored by: Netflix Sponsored by: Nginx, Inc.
Diffstat (limited to 'sys/netinet6')
-rw-r--r--sys/netinet6/in6_var.h15
1 files changed, 1 insertions, 14 deletions
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index e2f356d..09928b3 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -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)
OpenPOWER on IntegriCloud