xnu-517.9.5.tar.gz

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

diff --git a/bsd/net/if_ethersubr.c b/bsd/net/if_ethersubr.c
index 7e6c57d766f054a054d339e23c019dc847b0d234..0df1345ba84d75f40253e3d0cbfe5bdc877206e6 100644 (file)
--- a/bsd/net/if_ethersubr.c
+++ b/bsd/net/if_ethersubr.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @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,
  * 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@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -102,8 +99,6 @@ extern struct ifqueue pkintrq;
 #include <net/if_vlan_var.h>
 #endif /* NVLAN > 0 */
 
 #include <net/if_vlan_var.h>
 #endif /* NVLAN > 0 */
 

-static int ether_resolvemulti __P((struct ifnet *, struct sockaddr **, 
-                                   struct sockaddr *));

 extern u_char  etherbroadcastaddr[];
 #define senderr(e) do { error = (e); goto bad;} while (0)
 #define IFP2AC(IFP) ((struct arpcom *)IFP)
 extern u_char  etherbroadcastaddr[];
 #define senderr(e) do { error = (e); goto bad;} while (0)
 #define IFP2AC(IFP) ((struct arpcom *)IFP)


@@ -132,7 +127,6 @@ ether_ifattach(ifp)
        ifp->if_addrlen = 6;
        ifp->if_hdrlen = 14;
        ifp->if_mtu = ETHERMTU;
        ifp->if_addrlen = 6;
        ifp->if_hdrlen = 14;
        ifp->if_mtu = ETHERMTU;

-       ifp->if_resolvemulti = ether_resolvemulti;

        if (ifp->if_baudrate == 0)
            ifp->if_baudrate = 10000000;
 
        if (ifp->if_baudrate == 0)
            ifp->if_baudrate = 10000000;