xnu-792.24.17.tar.gz

[apple/xnu.git] / bsd / netat / aurp.h

diff --git a/bsd/netat/aurp.h b/bsd/netat/aurp.h
index 9df123b1b9b158b378e2fd94cbe950156f46a2dd..c98f2321f7f791fa465217b0ccc59bb8510c7649 100644 (file)
--- a/bsd/netat/aurp.h
+++ b/bsd/netat/aurp.h
@@ -1,29 +1,23 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_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
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * 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.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * 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
+ * This 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,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * 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.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
  */
 /*
  *     Copyright (c) 1996 Apple Computer, Inc. 
@@ -33,8 +27,6 @@
  *     File: aurp.h
  */
 
-#ifdef AURP_SUPPORT
-
 #ifndef _NETAT_AURP_H_
 #define        _NETAT_AURP_H_
 #include <sys/appleapiopts.h>
@@ -174,6 +166,9 @@ typedef struct {
        unsigned short flags;
 } aurp_hdr_t;
 
+#ifdef AURP_SUPPORT
+
+extern atlock_t aurpgen_lock;
 extern gref_t *aurp_gref;
 extern unsigned char dst_addr_cnt;
 extern unsigned char net_access_cnt;
@@ -183,6 +178,7 @@ extern int net_port;
 extern int update_tmo;
 extern aurp_state_t aurp_state[];
 extern unsigned short net_access[];
+#endif
 
 struct myq
 {      struct mbuf *q_head;
@@ -190,6 +186,7 @@ struct myq
        int q_cnt;
 };
 
+#define LOCK_DECL(x)   atlock_t x
 
 #include <sys/uio_internal.h>
 
@@ -292,5 +289,3 @@ extern struct aurp_global_t aurp_global;
 #endif /* KERNEL_PRIVATE */
 #endif /* __APPLE_API_OBSOLETE */
 #endif /* _NETAT_AURP_H_ */
-
-#endif  /* AURP_SUPPORT */