xnu-3789.1.32.tar.gz

[apple/xnu.git] / bsd / netinet6 / in6.h

diff --git a/bsd/netinet6/in6.h b/bsd/netinet6/in6.h
index 863d539351e5b9c4f76c4c8fd03e092ffcb1423a..b09c026b4dfe802f807a5da3da10989b890c2ace 100644 (file)
--- a/bsd/netinet6/in6.h
+++ b/bsd/netinet6/in6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Apple Inc. All rights reserved.
+ * Copyright (c) 2008-2015 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
@@ -457,12 +457,7 @@ extern const struct in6_addr in6addr_linklocal_allv2routers;
 #endif /* KERNEL */
 
 #ifdef PRIVATE
-#ifndef KERNEL
-/* Private declaration for user-space (needed by ip6_mroute.h) */
-struct route_in6 {
-#else /* KERNEL */
 struct route_in6_old {
-#endif /* KERNEL */
        void            *ro_rt;
        uint32_t        ro_flags;
        struct sockaddr_in6 ro_dst;
@@ -838,7 +833,7 @@ struct ip6_mtuinfo {
        { 0, 0 }, \
        { 0, 0 }, \
        { 0, 0 }, \
-       { "pim6", CTLTYPE_NODE }, \
+       { 0, 0 }, \
 }
 /*
  * Redefinition of mbuf flags
@@ -927,6 +922,7 @@ extern int inet6_rth_reverse(const void *, void *);
 extern int inet6_rth_segments(const void *);
 extern struct in6_addr *inet6_rth_getaddr(const void *, int);
 extern void addrsel_policy_init(void);
+
 __END_DECLS
 #endif /* !KERNEL */
 #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */