xnu-1699.26.8.tar.gz

[apple/xnu.git] / bsd / net / kext_net.c

diff --git a/bsd/net/kext_net.c b/bsd/net/kext_net.c
index e360fd7d4b5f4ed5c7eeb45bdc2e014f2899c80a..c9ba8eb8316b6e612fd2e3e9ddf75756f6ef1609 100644 (file)
--- a/bsd/net/kext_net.c
+++ b/bsd/net/kext_net.c
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, 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
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
+ * 
+ * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (C) 1999 Apple Computer, Inc.  */
 
@@ -99,7 +102,8 @@ register_sockfilter(struct NFDescriptor *nfp, struct NFDescriptor *nfp1,
        return(0);
 }
 
-unregister_sockfilter(struct NFDescriptor *nfp, struct protosw *pr, int flags)
+int
+unregister_sockfilter(struct NFDescriptor *nfp, struct protosw *pr, __unused int flags)
 {      int s;
 
        s = splhigh();
@@ -132,7 +136,7 @@ find_nke(unsigned int handle)
  */
 int
 nke_insert(struct socket *so, struct so_nke *np)
-{      int s, error;
+{
        struct kextcb *kp, *kp1;
        struct NFDescriptor *nf1, *nf2 = NULL;