xnu-1228.0.2.tar.gz

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

diff --git a/bsd/net/ether_inet6_pr_module.c b/bsd/net/ether_inet6_pr_module.c
index eea4985328bb10f0d792e2291210db00633ff568..979239c66c49ee43218e581a7b459dbd1fde91fb 100644 (file)
--- a/bsd/net/ether_inet6_pr_module.c
+++ b/bsd/net/ether_inet6_pr_module.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -111,9 +111,7 @@ extern struct ifqueue pkintrq;
 #include <net/if_vlan_var.h>
 #endif /* NVLAN > 0 */
 
-/* Local function declerations */
-int ether_attach_inet6(struct ifnet *ifp, u_long protocol_family);
-int ether_detach_inet6(struct ifnet *ifp, u_long protocol_family);
+#include <net/ether_if_module.h>
 
 /*
  * Process a received Ethernet packet;
@@ -121,18 +119,21 @@ int ether_detach_inet6(struct ifnet *ifp, u_long protocol_family);
  * the ether header, which is provided separately.
  */
 static errno_t
-inet6_ether_input(
+ether_inet6_input(
        __unused ifnet_t        ifp,
        protocol_family_t       protocol,
        mbuf_t                          packet,
        __unused char           *header)
 {
-       proto_input(protocol, packet);
-       return 0;
+       errno_t error;
+
+       if ((error = proto_input(protocol, packet)))
+               m_freem(packet);
+       return error;
 }
 
 static errno_t
-inet6_ether_pre_output(
+ether_inet6_pre_output(
     ifnet_t                                    ifp,
     __unused protocol_family_t protocol_family,
     mbuf_t                                     *m0,
@@ -206,37 +207,29 @@ ether_inet6_prmod_ioctl(
     struct ifreq *ifr = (struct ifreq *) data;
     int error = 0;
 
-    switch (command) {
-    case SIOCSIFADDR:
-        if ((ifp->if_flags & IFF_RUNNING) == 0) {
-             ifnet_set_flags(ifp, IFF_UP, IFF_UP);
-             dlil_ioctl(0, ifp, SIOCSIFFLAGS, (caddr_t) 0);
-        }
+       switch (command) {
+       case SIOCSIFADDR:
+               if ((ifp->if_flags & IFF_RUNNING) == 0) {
+                       ifnet_set_flags(ifp, IFF_UP, IFF_UP);
+                       ifnet_ioctl(ifp, 0, SIOCSIFFLAGS, NULL);
+               }
+               break;
 
-       break;
-
-    case SIOCGIFADDR:
+       case SIOCGIFADDR:
        ifnet_lladdr_copy_bytes(ifp, ifr->ifr_addr.sa_data, ETHER_ADDR_LEN);
-    break;
-
-    case SIOCSIFMTU:
-       /*
-        * IOKit IONetworkFamily will set the right MTU according to the driver
-        */
-
-        return (0);
+       break;
 
     default:
-        return EOPNOTSUPP;
+       error = EOPNOTSUPP;
+       break;
     }
-
     return (error);
 }
 
-int
+errno_t
 ether_attach_inet6(
        struct ifnet    *ifp,
-       __unused u_long protocol_family)
+       __unused protocol_family_t protocol_family)
 {
        struct ifnet_attach_proto_param proto;
        struct ifnet_demux_desc demux[1];
@@ -249,8 +242,8 @@ ether_attach_inet6(
        demux[0].datalen = sizeof(en_6native);
        proto.demux_list = demux;
        proto.demux_count = 1;
-       proto.input = inet6_ether_input;
-       proto.pre_output = inet6_ether_pre_output;
+       proto.input = ether_inet6_input;
+       proto.pre_output = ether_inet6_pre_output;
        proto.ioctl = ether_inet6_prmod_ioctl;
        proto.resolve = ether_inet6_resolve_multi;
        error = ifnet_attach_protocol(ifp, protocol_family, &proto);
@@ -262,19 +255,17 @@ ether_attach_inet6(
        return error;
 }
 
-int
+void
 ether_detach_inet6(
        struct ifnet    *ifp,
-       u_long                  protocol_family)
+       protocol_family_t protocol_family)
 {
-    errno_t         error;
+       errno_t         error;
 
        error = ifnet_detach_protocol(ifp, protocol_family);
        if (error && error != ENOENT) {
                printf("WARNING: ether_detach_inet6 can't detach ipv6 from %s%d\n",
                        ifp->if_name, ifp->if_unit);
        }
-
-    return error;
 }