xnu-344.21.73.tar.gz

[apple/xnu.git] / bsd / netinet / igmp.c

diff --git a/bsd/netinet/igmp.c b/bsd/netinet/igmp.c
index 380540120e604afbf654715c1ca7bfaa99fb7b96..58abc8d3511278302b55b5879cfab8b5db8bd455 100644 (file)
--- a/bsd/netinet/igmp.c
+++ b/bsd/netinet/igmp.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * 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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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_LICENSE_HEADER_END@
  */
@@ -89,7 +92,9 @@
 #include <netinet/igmp.h>
 #include <netinet/igmp_var.h>
 
+#ifndef __APPLE__
 static MALLOC_DEFINE(M_IGMP, "igmp", "igmp state");
+#endif
 
 static struct router_info *
                find_rti __P((struct ifnet *ifp));
@@ -154,11 +159,7 @@ find_rti(ifp)
                 rti = rti->rti_next;
         }
 
-#if ISFB31
        MALLOC(rti, struct router_info *, sizeof *rti, M_IGMP, M_NOWAIT);
-#else
-       MALLOC(rti, struct router_info *, sizeof *rti, M_TEMP, M_WAITOK);
-#endif
         rti->rti_ifp = ifp;
         rti->rti_type = IGMP_V2_ROUTER;
         rti->rti_time = 0;
@@ -505,9 +506,6 @@ igmp_sendpkt(inm, type, addr)
         * XXX
         * Do we have to worry about reentrancy here?  Don't think so.
         */
-#if IPSEC
-       m->m_pkthdr.rcvif = NULL;
-#endif /*IPSEC*/
         ip_output(m, router_alert, &igmprt, 0, &imo);
 
         ++igmpstat.igps_snd_reports;