xnu-2422.1.72.tar.gz

[apple/xnu.git] / bsd / net / kpi_protocol.h

diff --git a/bsd/net/kpi_protocol.h b/bsd/net/kpi_protocol.h
index 46877b8bef4d27f023ec57bc98bd4858ea4ba781..22269650263d859e1f08ebec36973955bde66287 100644 (file)
--- a/bsd/net/kpi_protocol.h
+++ b/bsd/net/kpi_protocol.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2008 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2008-2012 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*!
@@ -39,14 +39,13 @@
 #include <sys/kernel_types.h>
 #include <net/kpi_interface.h>
 
-
 __BEGIN_DECLS
 
 /******************************************************************************/
 /* Protocol input/inject                                                      */
 /******************************************************************************/
 
-#ifdef KERNEL_PRIVATE
+#ifdef BSD_KERNEL_PRIVATE
 /*!
        @typedef protocol_input_handler
        @discussion protocol_input_handler is called to input a packet. If
@@ -97,7 +96,7 @@ extern errno_t proto_register_input(protocol_family_t protocol,
        @result A errno error on failure.
  */
 extern void proto_unregister_input(protocol_family_t protocol);
-#endif /* KERNEL_PRIVATE */
+#endif /* BSD_KERNEL_PRIVATE */
 
 /*!
        @function proto_input
@@ -181,7 +180,7 @@ extern errno_t proto_register_plumber(protocol_family_t proto_fam,
 extern void proto_unregister_plumber(protocol_family_t proto_fam,
     ifnet_family_t if_fam);
 
-#ifdef KERNEL_PRIVATE
+#ifdef BSD_KERNEL_PRIVATE
 /*
        @function proto_plumb
        @discussion Plumbs a protocol to an actual interface.  This will find
@@ -212,9 +211,9 @@ extern errno_t proto_plumb(protocol_family_t protocol_family, ifnet_t ifp);
 extern errno_t proto_unplumb(protocol_family_t protocol_family, ifnet_t ifp);
 
 __private_extern__ void
-proto_kpi_init(void) __attribute__((section("__TEXT, initcode")));
+proto_kpi_init(void);
 
-#endif /* KERNEL_PRIVATE */
+#endif /* BSD_KERNEL_PRIVATE */
 __END_DECLS
 
 #endif /* __KPI_PROTOCOL__ */