xnu-344.23.tar.gz

[apple/xnu.git] / bsd / netinet / in_var.h

diff --git a/bsd/netinet/in_var.h b/bsd/netinet/in_var.h
index 16baa2c1564e426b6133db1cd4a4903dad616fbc..0c9d8c82944c4b5c9b846110b4914ba262637c81 100644 (file)
--- a/bsd/netinet/in_var.h
+++ b/bsd/netinet/in_var.h
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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.
  * 
- * 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.
- * 
- * 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_LICENSE_HEADER_END@
  */
@@ -118,13 +115,6 @@ struct kev_in_data {
        struct  in_addr ia_dstaddr;
 };
 
-struct kev_in_collision {
-       struct  net_event_data  link_data;      /* link colliding arp was received on */
-       struct  in_addr ia_ipaddr;      /* IP address we and another node are using */
-       u_char  hw_len; /* length of hardware address */
-       u_char  hw_addr[0];     /* variable length hardware address */
-};
-
 
 /*
  * Define inet event subclass and specific inet events.
@@ -138,7 +128,6 @@ struct kev_in_collision {
 #define KEV_INET_SIFDSTADDR   4
 #define KEV_INET_SIFBRDADDR   5
 #define KEV_INET_SIFNETMASK   6
-#define KEV_INET_ARPCOLLISION 7        /* use kev_in_collision */
 #endif /* __APPLE__ */
 
 /*