xnu-4903.270.47.tar.gz

[apple/xnu.git] / bsd / netinet6 / mld6.c

diff --git a/bsd/netinet6/mld6.c b/bsd/netinet6/mld6.c
index ca0f1c7fd9dba7ecf93a10d551feb30178bd1fa3..60b7777cded0d469975979fb8cca3b803ef4d57a 100644 (file)
--- a/bsd/netinet6/mld6.c
+++ b/bsd/netinet6/mld6.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2017 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * Copyright (c) 2000-2017 Apple 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
  * 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


@@ -11,10 +11,10 @@
  * 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.
  * 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.
  * 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,
  * 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,


@@ -22,7 +22,7 @@
  * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*-
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*-


@@ -166,54 +166,54 @@ static decl_lck_mtx_data(, mld_mtx);
 
 SLIST_HEAD(mld_in6m_relhead, in6_multi);
 
 
 SLIST_HEAD(mld_in6m_relhead, in6_multi);
 

-static void    mli_initvar(struct mld_ifinfo *, struct ifnet *, int);
+static void     mli_initvar(struct mld_ifinfo *, struct ifnet *, int);

 static struct mld_ifinfo *mli_alloc(int);
 static struct mld_ifinfo *mli_alloc(int);

-static void    mli_free(struct mld_ifinfo *);
-static void    mli_delete(const struct ifnet *, struct mld_in6m_relhead *);
-static void    mld_dispatch_packet(struct mbuf *);
-static void    mld_final_leave(struct in6_multi *, struct mld_ifinfo *,
-                   struct mld_tparams *);
-static int     mld_handle_state_change(struct in6_multi *, struct mld_ifinfo *,
-                   struct mld_tparams *);
-static int     mld_initial_join(struct in6_multi *, struct mld_ifinfo *,
-                   struct mld_tparams *, const int);
+static void     mli_free(struct mld_ifinfo *);
+static void     mli_delete(const struct ifnet *, struct mld_in6m_relhead *);
+static void     mld_dispatch_packet(struct mbuf *);
+static void     mld_final_leave(struct in6_multi *, struct mld_ifinfo *,
+    struct mld_tparams *);
+static int      mld_handle_state_change(struct in6_multi *, struct mld_ifinfo *,
+    struct mld_tparams *);
+static int      mld_initial_join(struct in6_multi *, struct mld_ifinfo *,
+    struct mld_tparams *, const int);

 #ifdef MLD_DEBUG
 #ifdef MLD_DEBUG

-static const char *    mld_rec_type_to_str(const int);
+static const char *     mld_rec_type_to_str(const int);

 #endif
 #endif

-static uint32_t        mld_set_version(struct mld_ifinfo *, const int);
-static void    mld_flush_relq(struct mld_ifinfo *, struct mld_in6m_relhead *);
-static void    mld_dispatch_queue_locked(struct mld_ifinfo *, struct ifqueue *, int);
-static int     mld_v1_input_query(struct ifnet *, const struct ip6_hdr *,
-                   /*const*/ struct mld_hdr *);
-static int     mld_v1_input_report(struct ifnet *, struct mbuf *,
-                   const struct ip6_hdr *, /*const*/ struct mld_hdr *);
-static void    mld_v1_process_group_timer(struct in6_multi *, const int);
-static void    mld_v1_process_querier_timers(struct mld_ifinfo *);
-static int     mld_v1_transmit_report(struct in6_multi *, const int);
-static uint32_t        mld_v1_update_group(struct in6_multi *, const int);
-static void    mld_v2_cancel_link_timers(struct mld_ifinfo *);
-static uint32_t        mld_v2_dispatch_general_query(struct mld_ifinfo *);
+static uint32_t mld_set_version(struct mld_ifinfo *, const int);
+static void     mld_flush_relq(struct mld_ifinfo *, struct mld_in6m_relhead *);
+static void     mld_dispatch_queue_locked(struct mld_ifinfo *, struct ifqueue *, int);
+static int      mld_v1_input_query(struct ifnet *, const struct ip6_hdr *,
+    /*const*/ struct mld_hdr *);
+static int      mld_v1_input_report(struct ifnet *, struct mbuf *,
+    const struct ip6_hdr *, /*const*/ struct mld_hdr *);
+static void     mld_v1_process_group_timer(struct in6_multi *, const int);
+static void     mld_v1_process_querier_timers(struct mld_ifinfo *);
+static int      mld_v1_transmit_report(struct in6_multi *, const int);
+static uint32_t mld_v1_update_group(struct in6_multi *, const int);
+static void     mld_v2_cancel_link_timers(struct mld_ifinfo *);
+static uint32_t mld_v2_dispatch_general_query(struct mld_ifinfo *);

 static struct mbuf *
 static struct mbuf *

-               mld_v2_encap_report(struct ifnet *, struct mbuf *);
-static int     mld_v2_enqueue_filter_change(struct ifqueue *,
-                   struct in6_multi *);
-static int     mld_v2_enqueue_group_record(struct ifqueue *,
-                   struct in6_multi *, const int, const int, const int,
-                   const int);
-static int     mld_v2_input_query(struct ifnet *, const struct ip6_hdr *,
-                   struct mbuf *, const int, const int);
-static int     mld_v2_merge_state_changes(struct in6_multi *,
-                   struct ifqueue *);
-static void    mld_v2_process_group_timers(struct mld_ifinfo *,
-                   struct ifqueue *, struct ifqueue *,
-                   struct in6_multi *, const int);
-static int     mld_v2_process_group_query(struct in6_multi *,
-                   int, struct mbuf *, const int);
-static int     sysctl_mld_gsr SYSCTL_HANDLER_ARGS;
-static int     sysctl_mld_ifinfo SYSCTL_HANDLER_ARGS;
-static int     sysctl_mld_v2enable SYSCTL_HANDLER_ARGS;
-
-static int mld_timeout_run;            /* MLD timer is scheduled to run */
+mld_v2_encap_report(struct ifnet *, struct mbuf *);
+static int      mld_v2_enqueue_filter_change(struct ifqueue *,
+    struct in6_multi *);
+static int      mld_v2_enqueue_group_record(struct ifqueue *,
+    struct in6_multi *, const int, const int, const int,
+    const int);
+static int      mld_v2_input_query(struct ifnet *, const struct ip6_hdr *,
+    struct mbuf *, const int, const int);
+static int      mld_v2_merge_state_changes(struct in6_multi *,
+    struct ifqueue *);
+static void     mld_v2_process_group_timers(struct mld_ifinfo *,
+    struct ifqueue *, struct ifqueue *,
+    struct in6_multi *, const int);
+static int      mld_v2_process_group_query(struct in6_multi *,
+    int, struct mbuf *, const int);
+static int      sysctl_mld_gsr SYSCTL_HANDLER_ARGS;
+static int      sysctl_mld_ifinfo SYSCTL_HANDLER_ARGS;
+static int      sysctl_mld_v2enable SYSCTL_HANDLER_ARGS;
+
+static int mld_timeout_run;             /* MLD timer is scheduled to run */

 static void mld_timeout(void *);
 static void mld_sched_timeout(void);
 
 static void mld_timeout(void *);
 static void mld_sched_timeout(void);
 


@@ -232,35 +232,35 @@ static unsigned int mld_mli_list_genid;
 /*
  * Subsystem lock macros.
  */
 /*
  * Subsystem lock macros.
  */

-#define        MLD_LOCK()                      \
+#define MLD_LOCK()                      \

        lck_mtx_lock(&mld_mtx)
        lck_mtx_lock(&mld_mtx)

-#define        MLD_LOCK_ASSERT_HELD()          \
+#define MLD_LOCK_ASSERT_HELD()          \

        LCK_MTX_ASSERT(&mld_mtx, LCK_MTX_ASSERT_OWNED)
        LCK_MTX_ASSERT(&mld_mtx, LCK_MTX_ASSERT_OWNED)

-#define        MLD_LOCK_ASSERT_NOTHELD()       \
+#define MLD_LOCK_ASSERT_NOTHELD()       \

        LCK_MTX_ASSERT(&mld_mtx, LCK_MTX_ASSERT_NOTOWNED)
        LCK_MTX_ASSERT(&mld_mtx, LCK_MTX_ASSERT_NOTOWNED)

-#define        MLD_UNLOCK()                    \
+#define MLD_UNLOCK()                    \

        lck_mtx_unlock(&mld_mtx)
 
        lck_mtx_unlock(&mld_mtx)
 

-#define        MLD_ADD_DETACHED_IN6M(_head, _in6m) {                           \
-       SLIST_INSERT_HEAD(_head, _in6m, in6m_dtle);                     \
+#define MLD_ADD_DETACHED_IN6M(_head, _in6m) {                           \
+       SLIST_INSERT_HEAD(_head, _in6m, in6m_dtle);                     \

 }
 
 }
 

-#define        MLD_REMOVE_DETACHED_IN6M(_head) {                               \
-       struct in6_multi *_in6m, *_inm_tmp;                             \
-       SLIST_FOREACH_SAFE(_in6m, _head, in6m_dtle, _inm_tmp) {         \
-               SLIST_REMOVE(_head, _in6m, in6_multi, in6m_dtle);       \
-               IN6M_REMREF(_in6m);                                     \
-       }                                                               \
-       VERIFY(SLIST_EMPTY(_head));                                     \
+#define MLD_REMOVE_DETACHED_IN6M(_head) {                               \
+       struct in6_multi *_in6m, *_inm_tmp;                             \
+       SLIST_FOREACH_SAFE(_in6m, _head, in6m_dtle, _inm_tmp) {         \
+               SLIST_REMOVE(_head, _in6m, in6_multi, in6m_dtle);       \
+               IN6M_REMREF(_in6m);                                     \
+       }                                                               \
+       VERIFY(SLIST_EMPTY(_head));                                     \

 }
 
 }
 

-#define        MLI_ZONE_MAX            64              /* maximum elements in zone */
-#define        MLI_ZONE_NAME           "mld_ifinfo"    /* zone name */
+#define MLI_ZONE_MAX            64              /* maximum elements in zone */
+#define MLI_ZONE_NAME           "mld_ifinfo"    /* zone name */

 
 

-static unsigned int mli_size;                  /* size of zone element */
-static struct zone *mli_zone;                  /* zone for mld_ifinfo */
+static unsigned int mli_size;                   /* size of zone element */
+static struct zone *mli_zone;                   /* zone for mld_ifinfo */

 
 

-SYSCTL_DECL(_net_inet6);       /* Note: Not in any common header. */
+SYSCTL_DECL(_net_inet6);        /* Note: Not in any common header. */

 
 SYSCTL_NODE(_net_inet6, OID_AUTO, mld, CTLFLAG_RW | CTLFLAG_LOCKED, 0,
     "IPv6 Multicast Listener Discovery");
 
 SYSCTL_NODE(_net_inet6, OID_AUTO, mld, CTLFLAG_RW | CTLFLAG_LOCKED, 0,
     "IPv6 Multicast Listener Discovery");


@@ -270,34 +270,34 @@ SYSCTL_PROC(_net_inet6_mld, OID_AUTO, gsrdelay,
     "Rate limit for MLDv2 Group-and-Source queries in seconds");
 
 SYSCTL_NODE(_net_inet6_mld, OID_AUTO, ifinfo, CTLFLAG_RD | CTLFLAG_LOCKED,
     "Rate limit for MLDv2 Group-and-Source queries in seconds");
 
 SYSCTL_NODE(_net_inet6_mld, OID_AUTO, ifinfo, CTLFLAG_RD | CTLFLAG_LOCKED,

-   sysctl_mld_ifinfo, "Per-interface MLDv2 state");
+    sysctl_mld_ifinfo, "Per-interface MLDv2 state");

 
 

-static int     mld_v1enable = 1;
+static int      mld_v1enable = 1;

 SYSCTL_INT(_net_inet6_mld, OID_AUTO, v1enable, CTLFLAG_RW | CTLFLAG_LOCKED,
     &mld_v1enable, 0, "Enable fallback to MLDv1");
 
 SYSCTL_INT(_net_inet6_mld, OID_AUTO, v1enable, CTLFLAG_RW | CTLFLAG_LOCKED,
     &mld_v1enable, 0, "Enable fallback to MLDv1");
 

-static int     mld_v2enable = 1;
+static int      mld_v2enable = 1;

 SYSCTL_PROC(_net_inet6_mld, OID_AUTO, v2enable,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &mld_v2enable, 0, sysctl_mld_v2enable, "I",
     "Enable MLDv2 (debug purposes only)");
 
 SYSCTL_PROC(_net_inet6_mld, OID_AUTO, v2enable,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
     &mld_v2enable, 0, sysctl_mld_v2enable, "I",
     "Enable MLDv2 (debug purposes only)");
 

-static int     mld_use_allow = 1;
+static int      mld_use_allow = 1;

 SYSCTL_INT(_net_inet6_mld, OID_AUTO, use_allow, CTLFLAG_RW | CTLFLAG_LOCKED,
     &mld_use_allow, 0, "Use ALLOW/BLOCK for RFC 4604 SSM joins/leaves");
 
 #ifdef MLD_DEBUG
 int mld_debug = 0;
 SYSCTL_INT(_net_inet6_mld, OID_AUTO,
 SYSCTL_INT(_net_inet6_mld, OID_AUTO, use_allow, CTLFLAG_RW | CTLFLAG_LOCKED,
     &mld_use_allow, 0, "Use ALLOW/BLOCK for RFC 4604 SSM joins/leaves");
 
 #ifdef MLD_DEBUG
 int mld_debug = 0;
 SYSCTL_INT(_net_inet6_mld, OID_AUTO,

-       debug, CTLFLAG_RW | CTLFLAG_LOCKED,     &mld_debug, 0, "");
+    debug, CTLFLAG_RW | CTLFLAG_LOCKED, &mld_debug, 0, "");

 #endif
 /*
  * Packed Router Alert option structure declaration.
  */
 struct mld_raopt {
 #endif
 /*
  * Packed Router Alert option structure declaration.
  */
 struct mld_raopt {

-       struct ip6_hbh          hbh;
-       struct ip6_opt          pad;
-       struct ip6_opt_router   ra;
+       struct ip6_hbh          hbh;
+       struct ip6_opt          pad;
+       struct ip6_opt_router   ra;

 } __packed;
 
 /*
 } __packed;
 
 /*


@@ -307,16 +307,16 @@ static struct mld_raopt mld_ra = {
        .hbh = { 0, 0 },
        .pad = { .ip6o_type = IP6OPT_PADN, 0 },
        .ra = {
        .hbh = { 0, 0 },
        .pad = { .ip6o_type = IP6OPT_PADN, 0 },
        .ra = {

-           .ip6or_type = (u_int8_t)IP6OPT_ROUTER_ALERT,
-           .ip6or_len = (u_int8_t)(IP6OPT_RTALERT_LEN - 2),
-           .ip6or_value =  {((IP6OPT_RTALERT_MLD >> 8) & 0xFF),
-               (IP6OPT_RTALERT_MLD & 0xFF) }
+               .ip6or_type = (u_int8_t)IP6OPT_ROUTER_ALERT,
+               .ip6or_len = (u_int8_t)(IP6OPT_RTALERT_LEN - 2),
+               .ip6or_value =  {((IP6OPT_RTALERT_MLD >> 8) & 0xFF),
+                                (IP6OPT_RTALERT_MLD & 0xFF) }

        }
 };
 static struct ip6_pktopts mld_po;
 
 /* Store MLDv2 record count in the module private scratch space */
        }
 };
 static struct ip6_pktopts mld_po;
 
 /* Store MLDv2 record count in the module private scratch space */

-#define        vt_nrecs        pkt_mpriv.__mpriv_u.__mpriv32[0].__mpriv32_u.__val16[0]
+#define vt_nrecs        pkt_mpriv.__mpriv_u.__mpriv32[0].__mpriv32_u.__val16[0]

 
 static __inline void
 mld_save_context(struct mbuf *m, struct ifnet *ifp)
 
 static __inline void
 mld_save_context(struct mbuf *m, struct ifnet *ifp)


@@ -337,7 +337,7 @@ mld_scrub_context(struct mbuf *m)
 static __inline struct ifnet *
 mld_restore_context(struct mbuf *m)
 {
 static __inline struct ifnet *
 mld_restore_context(struct mbuf *m)
 {

-        return (m->m_pkthdr.rcvif);
+       return m->m_pkthdr.rcvif;

 }
 
 /*
 }
 
 /*


@@ -355,8 +355,9 @@ sysctl_mld_gsr SYSCTL_HANDLER_ARGS
        i = mld_gsrdelay.tv_sec;
 
        error = sysctl_handle_int(oidp, &i, 0, req);
        i = mld_gsrdelay.tv_sec;
 
        error = sysctl_handle_int(oidp, &i, 0, req);

-       if (error || !req->newptr)
+       if (error || !req->newptr) {

                goto out_locked;
                goto out_locked;

+       }

 
        if (i < -1 || i >= 60) {
                error = EINVAL;
 
        if (i < -1 || i >= 60) {
                error = EINVAL;


@@ -367,7 +368,7 @@ sysctl_mld_gsr SYSCTL_HANDLER_ARGS
 
 out_locked:
        MLD_UNLOCK();
 
 out_locked:
        MLD_UNLOCK();

-       return (error);
+       return error;

 }
 /*
  * Expose struct mld_ifinfo to userland, keyed by ifindex.
 }
 /*
  * Expose struct mld_ifinfo to userland, keyed by ifindex.


@@ -378,21 +379,23 @@ static int
 sysctl_mld_ifinfo SYSCTL_HANDLER_ARGS
 {
 #pragma unused(oidp)
 sysctl_mld_ifinfo SYSCTL_HANDLER_ARGS
 {
 #pragma unused(oidp)

-       int                     *name;
-       int                      error;
-       u_int                    namelen;
-       struct ifnet            *ifp;
-       struct mld_ifinfo       *mli;
-       struct mld_ifinfo_u     mli_u;
+       int                     *name;
+       int                      error;
+       u_int                    namelen;
+       struct ifnet            *ifp;
+       struct mld_ifinfo       *mli;
+       struct mld_ifinfo_u     mli_u;

 
        name = (int *)arg1;
        namelen = arg2;
 
 
        name = (int *)arg1;
        namelen = arg2;
 

-       if (req->newptr != USER_ADDR_NULL)
-               return (EPERM);
+       if (req->newptr != USER_ADDR_NULL) {
+               return EPERM;
+       }

 
 

-       if (namelen != 1)
-               return (EINVAL);
+       if (namelen != 1) {
+               return EINVAL;
+       }

 
        MLD_LOCK();
 
 
        MLD_LOCK();
 


@@ -406,10 +409,11 @@ sysctl_mld_ifinfo SYSCTL_HANDLER_ARGS
        ifnet_head_lock_shared();
        ifp = ifindex2ifnet[name[0]];
        ifnet_head_done();
        ifnet_head_lock_shared();
        ifp = ifindex2ifnet[name[0]];
        ifnet_head_done();

-       if (ifp == NULL)
+       if (ifp == NULL) {

                goto out_locked;
                goto out_locked;

+       }

 
 

-       bzero(&mli_u, sizeof (mli_u));
+       bzero(&mli_u, sizeof(mli_u));

 
        LIST_FOREACH(mli, &mli_head, mli_link) {
                MLI_LOCK(mli);
 
        LIST_FOREACH(mli, &mli_head, mli_link) {
                MLI_LOCK(mli);


@@ -429,13 +433,13 @@ sysctl_mld_ifinfo SYSCTL_HANDLER_ARGS
                mli_u.mli_uri = mli->mli_uri;
                MLI_UNLOCK(mli);
 
                mli_u.mli_uri = mli->mli_uri;
                MLI_UNLOCK(mli);
 

-               error = SYSCTL_OUT(req, &mli_u, sizeof (mli_u));
+               error = SYSCTL_OUT(req, &mli_u, sizeof(mli_u));

                break;
        }
 
 out_locked:
        MLD_UNLOCK();
                break;
        }
 
 out_locked:
        MLD_UNLOCK();

-       return (error);
+       return error;

 }
 
 static int
 }
 
 static int


@@ -452,8 +456,9 @@ sysctl_mld_v2enable SYSCTL_HANDLER_ARGS
        i = mld_v2enable;
 
        error = sysctl_handle_int(oidp, &i, 0, req);
        i = mld_v2enable;
 
        error = sysctl_handle_int(oidp, &i, 0, req);

-       if (error || !req->newptr)
+       if (error || !req->newptr) {

                goto out_locked;
                goto out_locked;

+       }

 
        if (i < 0 || i > 1) {
                error = EINVAL;
 
        if (i < 0 || i > 1) {
                error = EINVAL;


@@ -466,13 +471,15 @@ sysctl_mld_v2enable SYSCTL_HANDLER_ARGS
         * the MLD version back to v2. Otherwise, we have to explicitly
         * downgrade. Note that this functionality is to be used for debugging.
         */
         * the MLD version back to v2. Otherwise, we have to explicitly
         * downgrade. Note that this functionality is to be used for debugging.
         */

-       if (mld_v2enable == 1)
+       if (mld_v2enable == 1) {

                goto out_locked;
                goto out_locked;

+       }

 
        LIST_FOREACH(mli, &mli_head, mli_link) {
                MLI_LOCK(mli);
 
        LIST_FOREACH(mli, &mli_head, mli_link) {
                MLI_LOCK(mli);

-               if (mld_set_version(mli, MLD_VERSION_1) > 0)
+               if (mld_set_version(mli, MLD_VERSION_1) > 0) {

                        mtp.qpt = 1;
                        mtp.qpt = 1;

+               }

                MLI_UNLOCK(mli);
        }
 
                MLI_UNLOCK(mli);
        }
 


@@ -481,7 +488,7 @@ out_locked:
 
        mld_set_timeout(&mtp);
 
 
        mld_set_timeout(&mtp);
 

-       return (error);
+       return error;

 }
 
 /*
 }
 
 /*


@@ -502,33 +509,39 @@ mld_dispatch_queue_locked(struct mld_ifinfo *mli, struct ifqueue *ifq, int limit
 
        MLD_LOCK_ASSERT_HELD();
 
 
        MLD_LOCK_ASSERT_HELD();
 

-       if (mli != NULL)
+       if (mli != NULL) {

                MLI_LOCK_ASSERT_HELD(mli);
                MLI_LOCK_ASSERT_HELD(mli);

+       }

 
        for (;;) {
                IF_DEQUEUE(ifq, m);
 
        for (;;) {
                IF_DEQUEUE(ifq, m);

-               if (m == NULL)
+               if (m == NULL) {

                        break;
                        break;

+               }

                MLD_PRINTF(("%s: dispatch 0x%llx from 0x%llx\n", __func__,
                    (uint64_t)VM_KERNEL_ADDRPERM(ifq),
                    (uint64_t)VM_KERNEL_ADDRPERM(m)));
 
                MLD_PRINTF(("%s: dispatch 0x%llx from 0x%llx\n", __func__,
                    (uint64_t)VM_KERNEL_ADDRPERM(ifq),
                    (uint64_t)VM_KERNEL_ADDRPERM(m)));
 

-               if (mli != NULL)
+               if (mli != NULL) {

                        MLI_UNLOCK(mli);
                        MLI_UNLOCK(mli);

+               }

                MLD_UNLOCK();
 
                mld_dispatch_packet(m);
 
                MLD_LOCK();
                MLD_UNLOCK();
 
                mld_dispatch_packet(m);
 
                MLD_LOCK();

-               if (mli != NULL)
+               if (mli != NULL) {

                        MLI_LOCK(mli);
                        MLI_LOCK(mli);

+               }

 
 

-               if (--limit == 0)
+               if (--limit == 0) {

                        break;
                        break;

+               }

        }
 
        }
 

-       if (mli != NULL)
+       if (mli != NULL) {

                MLI_LOCK_ASSERT_HELD(mli);
                MLI_LOCK_ASSERT_HELD(mli);

+       }

 }
 
 /*
 }
 
 /*


@@ -546,20 +559,21 @@ mld_dispatch_queue_locked(struct mld_ifinfo *mli, struct ifqueue *ifq, int limit
 static __inline__ int
 mld_is_addr_reported(const struct in6_addr *addr)
 {
 static __inline__ int
 mld_is_addr_reported(const struct in6_addr *addr)
 {

-

        VERIFY(IN6_IS_ADDR_MULTICAST(addr));
 
        VERIFY(IN6_IS_ADDR_MULTICAST(addr));
 

-       if (IPV6_ADDR_MC_SCOPE(addr) == IPV6_ADDR_SCOPE_NODELOCAL)
-               return (0);
+       if (IPV6_ADDR_MC_SCOPE(addr) == IPV6_ADDR_SCOPE_NODELOCAL) {
+               return 0;
+       }

 
        if (IPV6_ADDR_MC_SCOPE(addr) == IPV6_ADDR_SCOPE_LINKLOCAL) {
                struct in6_addr tmp = *addr;
                in6_clearscope(&tmp);
 
        if (IPV6_ADDR_MC_SCOPE(addr) == IPV6_ADDR_SCOPE_LINKLOCAL) {
                struct in6_addr tmp = *addr;
                in6_clearscope(&tmp);

-               if (IN6_ARE_ADDR_EQUAL(&tmp, &in6addr_linklocal_allnodes))
-                       return (0);
+               if (IN6_ARE_ADDR_EQUAL(&tmp, &in6addr_linklocal_allnodes)) {
+                       return 0;
+               }

        }
 
        }
 

-       return (1);
+       return 1;

 }
 
 /*
 }
 
 /*


@@ -574,8 +588,9 @@ mld_domifattach(struct ifnet *ifp, int how)
            (uint64_t)VM_KERNEL_ADDRPERM(ifp), if_name(ifp)));
 
        mli = mli_alloc(how);
            (uint64_t)VM_KERNEL_ADDRPERM(ifp), if_name(ifp)));
 
        mli = mli_alloc(how);

-       if (mli == NULL)
-               return (NULL);
+       if (mli == NULL) {
+               return NULL;
+       }

 
        MLD_LOCK();
 
 
        MLD_LOCK();
 


@@ -597,7 +612,7 @@ mld_domifattach(struct ifnet *ifp, int how)
        MLD_PRINTF(("%s: allocate mld_ifinfo for ifp 0x%llx(%s)\n",
            __func__, (uint64_t)VM_KERNEL_ADDRPERM(ifp), if_name(ifp)));
 
        MLD_PRINTF(("%s: allocate mld_ifinfo for ifp 0x%llx(%s)\n",
            __func__, (uint64_t)VM_KERNEL_ADDRPERM(ifp), if_name(ifp)));
 

-       return (mli);
+       return mli;

 }
 
 /*
 }
 
 /*


@@ -638,7 +653,7 @@ mld_domifreattach(struct mld_ifinfo *mli)
 void
 mld_domifdetach(struct ifnet *ifp)
 {
 void
 mld_domifdetach(struct ifnet *ifp)
 {

-       SLIST_HEAD(, in6_multi) in6m_dthead;
+       SLIST_HEAD(, in6_multi) in6m_dthead;

 
        SLIST_INIT(&in6m_dthead);
 
 
        SLIST_INIT(&in6m_dthead);
 


@@ -698,10 +713,11 @@ mld6_initsilent(struct ifnet *ifp, struct mld_ifinfo *mli)
        MLI_LOCK_ASSERT_NOTHELD(mli);
        MLI_LOCK(mli);
        if (!(ifp->if_flags & IFF_MULTICAST) &&
        MLI_LOCK_ASSERT_NOTHELD(mli);
        MLI_LOCK(mli);
        if (!(ifp->if_flags & IFF_MULTICAST) &&

-           (ifp->if_eflags & (IFEF_IPV6_ND6ALT|IFEF_LOCALNET_PRIVATE)))
+           (ifp->if_eflags & (IFEF_IPV6_ND6ALT | IFEF_LOCALNET_PRIVATE))) {

                mli->mli_flags |= MLIF_SILENT;
                mli->mli_flags |= MLIF_SILENT;

-       else
+       } else {

                mli->mli_flags &= ~MLIF_SILENT;
                mli->mli_flags &= ~MLIF_SILENT;

+       }

        MLI_UNLOCK(mli);
 }
 
        MLI_UNLOCK(mli);
 }
 


@@ -711,20 +727,23 @@ mli_initvar(struct mld_ifinfo *mli, struct ifnet *ifp, int reattach)
        MLI_LOCK_ASSERT_HELD(mli);
 
        mli->mli_ifp = ifp;
        MLI_LOCK_ASSERT_HELD(mli);
 
        mli->mli_ifp = ifp;

-       if (mld_v2enable)
+       if (mld_v2enable) {

                mli->mli_version = MLD_VERSION_2;
                mli->mli_version = MLD_VERSION_2;

-       else
+       } else {

                mli->mli_version = MLD_VERSION_1;
                mli->mli_version = MLD_VERSION_1;

+       }

        mli->mli_flags = 0;
        mli->mli_rv = MLD_RV_INIT;
        mli->mli_qi = MLD_QI_INIT;
        mli->mli_qri = MLD_QRI_INIT;
        mli->mli_uri = MLD_URI_INIT;
 
        mli->mli_flags = 0;
        mli->mli_rv = MLD_RV_INIT;
        mli->mli_qi = MLD_QI_INIT;
        mli->mli_qri = MLD_QRI_INIT;
        mli->mli_uri = MLD_URI_INIT;
 

-       if (mld_use_allow)
+       if (mld_use_allow) {

                mli->mli_flags |= MLIF_USEALLOW;
                mli->mli_flags |= MLIF_USEALLOW;

-       if (!reattach)
+       }
+       if (!reattach) {

                SLIST_INIT(&mli->mli_relinmhead);
                SLIST_INIT(&mli->mli_relinmhead);

+       }

 
        /*
         * Responses to general queries are subject to bounds.
 
        /*
         * Responses to general queries are subject to bounds.


@@ -744,7 +763,7 @@ mli_alloc(int how)
                lck_mtx_init(&mli->mli_lock, mld_mtx_grp, mld_mtx_attr);
                mli->mli_debug |= IFD_ALLOC;
        }
                lck_mtx_init(&mli->mli_lock, mld_mtx_grp, mld_mtx_attr);
                mli->mli_debug |= IFD_ALLOC;
        }

-       return (mli);
+       return mli;

 }
 
 static void
 }
 
 static void


@@ -774,23 +793,25 @@ mli_free(struct mld_ifinfo *mli)
 void
 mli_addref(struct mld_ifinfo *mli, int locked)
 {
 void
 mli_addref(struct mld_ifinfo *mli, int locked)
 {

-       if (!locked)
+       if (!locked) {

                MLI_LOCK_SPIN(mli);
                MLI_LOCK_SPIN(mli);

-       else
+       } else {

                MLI_LOCK_ASSERT_HELD(mli);
                MLI_LOCK_ASSERT_HELD(mli);

+       }

 
        if (++mli->mli_refcnt == 0) {
                panic("%s: mli=%p wraparound refcnt", __func__, mli);
                /* NOTREACHED */
        }
 
        if (++mli->mli_refcnt == 0) {
                panic("%s: mli=%p wraparound refcnt", __func__, mli);
                /* NOTREACHED */
        }

-       if (!locked)
+       if (!locked) {

                MLI_UNLOCK(mli);
                MLI_UNLOCK(mli);

+       }

 }
 
 void
 mli_remref(struct mld_ifinfo *mli)
 {
 }
 
 void
 mli_remref(struct mld_ifinfo *mli)
 {

-       SLIST_HEAD(, in6_multi) in6m_dthead;
+       SLIST_HEAD(, in6_multi) in6m_dthead;

        struct ifnet *ifp;
 
        MLI_LOCK_SPIN(mli);
        struct ifnet *ifp;
 
        MLI_LOCK_SPIN(mli);


@@ -835,11 +856,11 @@ static int
 mld_v1_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6,
     /*const*/ struct mld_hdr *mld)
 {
 mld_v1_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6,
     /*const*/ struct mld_hdr *mld)
 {

-       struct mld_ifinfo       *mli;
-       struct in6_multi        *inm;
-       int                      err = 0, is_general_query;
-       uint16_t                 timer;
-       struct mld_tparams       mtp = { 0, 0, 0, 0 };
+       struct mld_ifinfo       *mli;
+       struct in6_multi        *inm;
+       int                      err = 0, is_general_query;
+       uint16_t                 timer;
+       struct mld_tparams       mtp = { 0, 0, 0, 0 };

 
        MLD_LOCK_ASSERT_NOTHELD();
 
 
        MLD_LOCK_ASSERT_NOTHELD();
 


@@ -872,7 +893,7 @@ mld_v1_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6,
                 * MLDv1 General Query.
                 * If this was not sent to the all-nodes group, ignore it.
                 */
                 * MLDv1 General Query.
                 * If this was not sent to the all-nodes group, ignore it.
                 */

-               struct in6_addr          dst;
+               struct in6_addr          dst;

 
                dst = ip6->ip6_dst;
                in6_clearscope(&dst);
 
                dst = ip6->ip6_dst;
                in6_clearscope(&dst);


@@ -900,8 +921,9 @@ mld_v1_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6,
        MLI_UNLOCK(mli);
 
        timer = ntohs(mld->mld_maxdelay) / MLD_TIMER_SCALE;
        MLI_UNLOCK(mli);
 
        timer = ntohs(mld->mld_maxdelay) / MLD_TIMER_SCALE;

-       if (timer == 0)
+       if (timer == 0) {

                timer = 1;
                timer = 1;

+       }

 
        if (is_general_query) {
                struct in6_multistep step;
 
        if (is_general_query) {
                struct in6_multistep step;


@@ -916,8 +938,9 @@ mld_v1_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6,
                IN6_FIRST_MULTI(step, inm);
                while (inm != NULL) {
                        IN6M_LOCK(inm);
                IN6_FIRST_MULTI(step, inm);
                while (inm != NULL) {
                        IN6M_LOCK(inm);

-                       if (inm->in6m_ifp == ifp)
+                       if (inm->in6m_ifp == ifp) {

                                mtp.cst += mld_v1_update_group(inm, timer);
                                mtp.cst += mld_v1_update_group(inm, timer);

+                       }

                        IN6M_UNLOCK(inm);
                        IN6_NEXT_MULTI(step, inm);
                }
                        IN6M_UNLOCK(inm);
                        IN6_NEXT_MULTI(step, inm);
                }


@@ -948,7 +971,7 @@ mld_v1_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6,
 done:
        mld_set_timeout(&mtp);
 
 done:
        mld_set_timeout(&mtp);
 

-       return (err);
+       return err;

 }
 
 /*
 }
 
 /*


@@ -961,7 +984,7 @@ done:
  * We may be updating the group for the first time since we switched
  * to MLDv2. If we are, then we must clear any recorded source lists,
  * and transition to REPORTING state; the group timer is overloaded
  * We may be updating the group for the first time since we switched
  * to MLDv2. If we are, then we must clear any recorded source lists,
  * and transition to REPORTING state; the group timer is overloaded

- * for group and group-source query responses. 
+ * for group and group-source query responses.

  *
  * Unlike MLDv2, the delay per group should be jittered
  * to avoid bursts of MLDv1 reports.
  *
  * Unlike MLDv2, the delay per group should be jittered
  * to avoid bursts of MLDv1 reports.


@@ -986,7 +1009,7 @@ mld_v1_update_group(struct in6_multi *inm, const int timer)
                            "skipping.\n", __func__));
                        break;
                }
                            "skipping.\n", __func__));
                        break;
                }

-               /* FALLTHROUGH */
+       /* FALLTHROUGH */

        case MLD_SG_QUERY_PENDING_MEMBER:
        case MLD_G_QUERY_PENDING_MEMBER:
        case MLD_IDLE_MEMBER:
        case MLD_SG_QUERY_PENDING_MEMBER:
        case MLD_G_QUERY_PENDING_MEMBER:
        case MLD_IDLE_MEMBER:


@@ -1004,7 +1027,7 @@ mld_v1_update_group(struct in6_multi *inm, const int timer)
                break;
        }
 
                break;
        }
 

-       return (inm->in6m_timer);
+       return inm->in6m_timer;

 }
 
 /*
 }
 
 /*


@@ -1019,14 +1042,14 @@ static int
 mld_v2_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6,
     struct mbuf *m, const int off, const int icmp6len)
 {
 mld_v2_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6,
     struct mbuf *m, const int off, const int icmp6len)
 {

-       struct mld_ifinfo       *mli;
-       struct mldv2_query      *mld;
-       struct in6_multi        *inm;
-       uint32_t                 maxdelay, nsrc, qqi;
-       int                      err = 0, is_general_query;
-       uint16_t                 timer;
-       uint8_t                  qrv;
-       struct mld_tparams       mtp = { 0, 0, 0, 0 };
+       struct mld_ifinfo       *mli;
+       struct mldv2_query      *mld;
+       struct in6_multi        *inm;
+       uint32_t                 maxdelay, nsrc, qqi;
+       int                      err = 0, is_general_query;
+       uint16_t                 timer;
+       uint8_t                  qrv;
+       struct mld_tparams       mtp = { 0, 0, 0, 0 };

 
        MLD_LOCK_ASSERT_NOTHELD();
 
 
        MLD_LOCK_ASSERT_NOTHELD();
 


@@ -1055,14 +1078,15 @@ mld_v2_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6,
 
        mld = (struct mldv2_query *)(mtod(m, uint8_t *) + off);
 
 
        mld = (struct mldv2_query *)(mtod(m, uint8_t *) + off);
 

-       maxdelay = ntohs(mld->mld_maxdelay);    /* in 1/10ths of a second */
+       maxdelay = ntohs(mld->mld_maxdelay);    /* in 1/10ths of a second */

        if (maxdelay >= 32768) {
                maxdelay = (MLD_MRC_MANT(maxdelay) | 0x1000) <<
        if (maxdelay >= 32768) {
                maxdelay = (MLD_MRC_MANT(maxdelay) | 0x1000) <<

-                          (MLD_MRC_EXP(maxdelay) + 3);
+                   (MLD_MRC_EXP(maxdelay) + 3);

        }
        timer = maxdelay / MLD_TIMER_SCALE;
        }
        timer = maxdelay / MLD_TIMER_SCALE;

-       if (timer == 0)
+       if (timer == 0) {

                timer = 1;
                timer = 1;

+       }

 
        qrv = MLD_QRV(mld->mld_misc);
        if (qrv < 2) {
 
        qrv = MLD_QRV(mld->mld_misc);
        if (qrv < 2) {


@@ -1074,7 +1098,7 @@ mld_v2_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6,
        qqi = mld->mld_qqi;
        if (qqi >= 128) {
                qqi = MLD_QQIC_MANT(mld->mld_qqi) <<
        qqi = mld->mld_qqi;
        if (qqi >= 128) {
                qqi = MLD_QQIC_MANT(mld->mld_qqi) <<

-                    (MLD_QQIC_EXP(mld->mld_qqi) + 3);
+                   (MLD_QQIC_EXP(mld->mld_qqi) + 3);

        }
 
        nsrc = ntohs(mld->mld_numsrc);
        }
 
        nsrc = ntohs(mld->mld_numsrc);


@@ -1164,8 +1188,9 @@ mld_v2_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6,
                in6_multihead_lock_shared();
                IN6_LOOKUP_MULTI(&mld->mld_addr, ifp, inm);
                in6_multihead_lock_done();
                in6_multihead_lock_shared();
                IN6_LOOKUP_MULTI(&mld->mld_addr, ifp, inm);
                in6_multihead_lock_done();

-               if (inm == NULL)
+               if (inm == NULL) {

                        goto done;
                        goto done;

+               }

 
                IN6M_LOCK(inm);
                if (nsrc > 0) {
 
                IN6M_LOCK(inm);
                if (nsrc > 0) {


@@ -1207,7 +1232,7 @@ done:
        }
        mld_set_timeout(&mtp);
 
        }
        mld_set_timeout(&mtp);
 

-       return (err);
+       return err;

 }
 
 /*
 }
 
 /*


@@ -1219,9 +1244,9 @@ static int
 mld_v2_process_group_query(struct in6_multi *inm, int timer, struct mbuf *m0,
     const int off)
 {
 mld_v2_process_group_query(struct in6_multi *inm, int timer, struct mbuf *m0,
     const int off)
 {

-       struct mldv2_query      *mld;
-       int                      retval;
-       uint16_t                 nsrc;
+       struct mldv2_query      *mld;
+       int                      retval;
+       uint16_t                 nsrc;

 
        IN6M_LOCK_ASSERT_HELD(inm);
 
 
        IN6M_LOCK_ASSERT_HELD(inm);
 


@@ -1236,7 +1261,7 @@ mld_v2_process_group_query(struct in6_multi *inm, int timer, struct mbuf *m0,
        case MLD_AWAKENING_MEMBER:
        case MLD_IDLE_MEMBER:
        case MLD_LEAVING_MEMBER:
        case MLD_AWAKENING_MEMBER:
        case MLD_IDLE_MEMBER:
        case MLD_LEAVING_MEMBER:

-               return (retval);
+               return retval;

        case MLD_REPORTING_MEMBER:
        case MLD_G_QUERY_PENDING_MEMBER:
        case MLD_SG_QUERY_PENDING_MEMBER:
        case MLD_REPORTING_MEMBER:
        case MLD_G_QUERY_PENDING_MEMBER:
        case MLD_SG_QUERY_PENDING_MEMBER:


@@ -1259,7 +1284,7 @@ mld_v2_process_group_query(struct in6_multi *inm, int timer, struct mbuf *m0,
                }
                inm->in6m_state = MLD_G_QUERY_PENDING_MEMBER;
                inm->in6m_timer = MLD_RANDOM_DELAY(timer);
                }
                inm->in6m_state = MLD_G_QUERY_PENDING_MEMBER;
                inm->in6m_timer = MLD_RANDOM_DELAY(timer);

-               return (retval);
+               return retval;

        }
 
        /*
        }
 
        /*


@@ -1269,7 +1294,7 @@ mld_v2_process_group_query(struct in6_multi *inm, int timer, struct mbuf *m0,
        if (inm->in6m_state == MLD_G_QUERY_PENDING_MEMBER) {
                timer = min(inm->in6m_timer, timer);
                inm->in6m_timer = MLD_RANDOM_DELAY(timer);
        if (inm->in6m_state == MLD_G_QUERY_PENDING_MEMBER) {
                timer = min(inm->in6m_timer, timer);
                inm->in6m_timer = MLD_RANDOM_DELAY(timer);

-               return (retval);
+               return retval;

        }
 
        /*
        }
 
        /*


@@ -1284,10 +1309,10 @@ mld_v2_process_group_query(struct in6_multi *inm, int timer, struct mbuf *m0,
         * report for those sources.
         */
        if (inm->in6m_nsrc > 0) {
         * report for those sources.
         */
        if (inm->in6m_nsrc > 0) {

-               struct mbuf             *m;
-               uint8_t                 *sp;
-               int                      i, nrecorded;
-               int                      soff;
+               struct mbuf             *m;
+               uint8_t                 *sp;
+               int                      i, nrecorded;
+               int                      soff;

 
                m = m0;
                soff = off + sizeof(struct mldv2_query);
 
                m = m0;
                soff = off + sizeof(struct mldv2_query);


@@ -1296,26 +1321,28 @@ mld_v2_process_group_query(struct in6_multi *inm, int timer, struct mbuf *m0,
                        sp = mtod(m, uint8_t *) + soff;
                        retval = in6m_record_source(inm,
                            (const struct in6_addr *)(void *)sp);
                        sp = mtod(m, uint8_t *) + soff;
                        retval = in6m_record_source(inm,
                            (const struct in6_addr *)(void *)sp);

-                       if (retval < 0)
+                       if (retval < 0) {

                                break;
                                break;

+                       }

                        nrecorded += retval;
                        soff += sizeof(struct in6_addr);
                        if (soff >= m->m_len) {
                                soff = soff - m->m_len;
                                m = m->m_next;
                        nrecorded += retval;
                        soff += sizeof(struct in6_addr);
                        if (soff >= m->m_len) {
                                soff = soff - m->m_len;
                                m = m->m_next;

-                               if (m == NULL)
+                               if (m == NULL) {

                                        break;
                                        break;

+                               }

                        }
                }
                if (nrecorded > 0) {
                        }
                }
                if (nrecorded > 0) {

-                       MLD_PRINTF(( "%s: schedule response to SG query\n",
+                       MLD_PRINTF(("%s: schedule response to SG query\n",

                            __func__));
                        inm->in6m_state = MLD_SG_QUERY_PENDING_MEMBER;
                        inm->in6m_timer = MLD_RANDOM_DELAY(timer);
                }
        }
 
                            __func__));
                        inm->in6m_state = MLD_SG_QUERY_PENDING_MEMBER;
                        inm->in6m_timer = MLD_RANDOM_DELAY(timer);
                }
        }
 

-       return (retval);
+       return retval;

 }
 
 /*
 }
 
 /*


@@ -1329,20 +1356,21 @@ static int
 mld_v1_input_report(struct ifnet *ifp, struct mbuf *m,
     const struct ip6_hdr *ip6, /*const*/ struct mld_hdr *mld)
 {
 mld_v1_input_report(struct ifnet *ifp, struct mbuf *m,
     const struct ip6_hdr *ip6, /*const*/ struct mld_hdr *mld)
 {

-       struct in6_addr          src, dst;
-       struct in6_ifaddr       *ia;
-       struct in6_multi        *inm;
+       struct in6_addr          src, dst;
+       struct in6_ifaddr       *ia;
+       struct in6_multi        *inm;

 
        if (!mld_v1enable) {
                MLD_PRINTF(("%s: ignore v1 report %s on ifp 0x%llx(%s)\n",
                    __func__, ip6_sprintf(&mld->mld_addr),
                    (uint64_t)VM_KERNEL_ADDRPERM(ifp), if_name(ifp)));
 
        if (!mld_v1enable) {
                MLD_PRINTF(("%s: ignore v1 report %s on ifp 0x%llx(%s)\n",
                    __func__, ip6_sprintf(&mld->mld_addr),
                    (uint64_t)VM_KERNEL_ADDRPERM(ifp), if_name(ifp)));

-               return (0);
+               return 0;

        }
 
        if ((ifp->if_flags & IFF_LOOPBACK) ||
        }
 
        if ((ifp->if_flags & IFF_LOOPBACK) ||

-           (m->m_pkthdr.pkt_flags & PKTF_LOOP))
-               return (0);
+           (m->m_pkthdr.pkt_flags & PKTF_LOOP)) {
+               return 0;
+       }

 
        /*
         * MLDv1 reports must originate from a host's link-local address,
 
        /*
         * MLDv1 reports must originate from a host's link-local address,


@@ -1354,7 +1382,7 @@ mld_v1_input_report(struct ifnet *ifp, struct mbuf *m,
                MLD_PRINTF(("%s: ignore v1 query src %s on ifp 0x%llx(%s)\n",
                    __func__, ip6_sprintf(&ip6->ip6_src),
                    (uint64_t)VM_KERNEL_ADDRPERM(ifp), if_name(ifp)));
                MLD_PRINTF(("%s: ignore v1 query src %s on ifp 0x%llx(%s)\n",
                    __func__, ip6_sprintf(&ip6->ip6_src),
                    (uint64_t)VM_KERNEL_ADDRPERM(ifp), if_name(ifp)));

-               return (EINVAL);
+               return EINVAL;

        }
 
        /*
        }
 
        /*


@@ -1368,7 +1396,7 @@ mld_v1_input_report(struct ifnet *ifp, struct mbuf *m,
                MLD_PRINTF(("%s: ignore v1 query dst %s on ifp 0x%llx(%s)\n",
                    __func__, ip6_sprintf(&ip6->ip6_dst),
                    (uint64_t)VM_KERNEL_ADDRPERM(ifp), if_name(ifp)));
                MLD_PRINTF(("%s: ignore v1 query dst %s on ifp 0x%llx(%s)\n",
                    __func__, ip6_sprintf(&ip6->ip6_dst),
                    (uint64_t)VM_KERNEL_ADDRPERM(ifp), if_name(ifp)));

-               return (EINVAL);
+               return EINVAL;

        }
 
        /*
        }
 
        /*


@@ -1381,18 +1409,18 @@ mld_v1_input_report(struct ifnet *ifp, struct mbuf *m,
         * returned by in6ifa_ifpforlinklocal(), but SHOULD NOT be
         * performed for the on-wire address.
         */
         * returned by in6ifa_ifpforlinklocal(), but SHOULD NOT be
         * performed for the on-wire address.
         */

-       ia = in6ifa_ifpforlinklocal(ifp, IN6_IFF_NOTREADY|IN6_IFF_ANYCAST);
+       ia = in6ifa_ifpforlinklocal(ifp, IN6_IFF_NOTREADY | IN6_IFF_ANYCAST);

        if (ia != NULL) {
                IFA_LOCK(&ia->ia_ifa);
        if (ia != NULL) {
                IFA_LOCK(&ia->ia_ifa);

-               if ((IN6_ARE_ADDR_EQUAL(&ip6->ip6_src, IA6_IN6(ia)))){
+               if ((IN6_ARE_ADDR_EQUAL(&ip6->ip6_src, IA6_IN6(ia)))) {

                        IFA_UNLOCK(&ia->ia_ifa);
                        IFA_REMREF(&ia->ia_ifa);
                        IFA_UNLOCK(&ia->ia_ifa);
                        IFA_REMREF(&ia->ia_ifa);

-                       return (0);
+                       return 0;

                }
                IFA_UNLOCK(&ia->ia_ifa);
                IFA_REMREF(&ia->ia_ifa);
        } else if (IN6_IS_ADDR_UNSPECIFIED(&src)) {
                }
                IFA_UNLOCK(&ia->ia_ifa);
                IFA_REMREF(&ia->ia_ifa);
        } else if (IN6_IS_ADDR_UNSPECIFIED(&src)) {

-               return (0);
+               return 0;

        }
 
        MLD_PRINTF(("%s: process v1 report %s on ifp 0x%llx(%s)\n",
        }
 
        MLD_PRINTF(("%s: process v1 report %s on ifp 0x%llx(%s)\n",


@@ -1403,8 +1431,9 @@ mld_v1_input_report(struct ifnet *ifp, struct mbuf *m,
         * Embed scope ID of receiving interface in MLD query for lookup
         * whilst we don't hold other locks (due to KAME locking lameness).
         */
         * Embed scope ID of receiving interface in MLD query for lookup
         * whilst we don't hold other locks (due to KAME locking lameness).
         */

-       if (!IN6_IS_ADDR_UNSPECIFIED(&mld->mld_addr))
+       if (!IN6_IS_ADDR_UNSPECIFIED(&mld->mld_addr)) {

                in6_setscope(&mld->mld_addr, ifp, NULL);
                in6_setscope(&mld->mld_addr, ifp, NULL);

+       }

 
        /*
         * MLDv1 report suppression.
 
        /*
         * MLDv1 report suppression.


@@ -1466,7 +1495,7 @@ out:
        /* XXX Clear embedded scope ID as userland won't expect it. */
        in6_clearscope(&mld->mld_addr);
 
        /* XXX Clear embedded scope ID as userland won't expect it. */
        in6_clearscope(&mld->mld_addr);
 

-       return (0);
+       return 0;

 }
 
 /*
 }
 
 /*


@@ -1483,10 +1512,10 @@ out:
 int
 mld_input(struct mbuf *m, int off, int icmp6len)
 {
 int
 mld_input(struct mbuf *m, int off, int icmp6len)
 {

-       struct ifnet    *ifp;
-       struct ip6_hdr  *ip6;
-       struct mld_hdr  *mld;
-       int              mldlen;
+       struct ifnet    *ifp;
+       struct ip6_hdr  *ip6;
+       struct mld_hdr  *mld;
+       int              mldlen;

 
        MLD_PRINTF(("%s: called w/mbuf (0x%llx,%d)\n", __func__,
            (uint64_t)VM_KERNEL_ADDRPERM(m), off));
 
        MLD_PRINTF(("%s: called w/mbuf (0x%llx,%d)\n", __func__,
            (uint64_t)VM_KERNEL_ADDRPERM(m), off));


@@ -1503,10 +1532,12 @@ mld_input(struct mbuf *m, int off, int icmp6len)
        } else {
                mldlen = sizeof(struct mld_hdr);
        }
        } else {
                mldlen = sizeof(struct mld_hdr);
        }

+       // check if mldv2_query/mld_hdr fits in the first mbuf
+       IP6_EXTHDR_CHECK(m, off, mldlen, return IPPROTO_DONE);

        IP6_EXTHDR_GET(mld, struct mld_hdr *, m, off, mldlen);
        if (mld == NULL) {
                icmp6stat.icp6s_badlen++;
        IP6_EXTHDR_GET(mld, struct mld_hdr *, m, off, mldlen);
        if (mld == NULL) {
                icmp6stat.icp6s_badlen++;

-               return (IPPROTO_DONE);
+               return IPPROTO_DONE;

        }
 
        /*
        }
 
        /*


@@ -1517,18 +1548,21 @@ mld_input(struct mbuf *m, int off, int icmp6len)
        case MLD_LISTENER_QUERY:
                icmp6_ifstat_inc(ifp, ifs6_in_mldquery);
                if (icmp6len == sizeof(struct mld_hdr)) {
        case MLD_LISTENER_QUERY:
                icmp6_ifstat_inc(ifp, ifs6_in_mldquery);
                if (icmp6len == sizeof(struct mld_hdr)) {

-                       if (mld_v1_input_query(ifp, ip6, mld) != 0)
-                               return (0);
+                       if (mld_v1_input_query(ifp, ip6, mld) != 0) {
+                               return 0;
+                       }

                } else if (icmp6len >= sizeof(struct mldv2_query)) {
                        if (mld_v2_input_query(ifp, ip6, m, off,
                } else if (icmp6len >= sizeof(struct mldv2_query)) {
                        if (mld_v2_input_query(ifp, ip6, m, off,

-                           icmp6len) != 0)
-                               return (0);
+                           icmp6len) != 0) {
+                               return 0;
+                       }

                }
                break;
        case MLD_LISTENER_REPORT:
                icmp6_ifstat_inc(ifp, ifs6_in_mldreport);
                }
                break;
        case MLD_LISTENER_REPORT:
                icmp6_ifstat_inc(ifp, ifs6_in_mldreport);

-               if (mld_v1_input_report(ifp, m, ip6, mld) != 0)
-                       return (0);
+               if (mld_v1_input_report(ifp, m, ip6, mld) != 0) {
+                       return 0;
+               }

                break;
        case MLDV2_LISTENER_REPORT:
                icmp6_ifstat_inc(ifp, ifs6_in_mldreport);
                break;
        case MLDV2_LISTENER_REPORT:
                icmp6_ifstat_inc(ifp, ifs6_in_mldreport);


@@ -1540,7 +1574,7 @@ mld_input(struct mbuf *m, int off, int icmp6len)
                break;
        }
 
                break;
        }
 

-       return (0);
+       return 0;

 }
 
 /*
 }
 
 /*


@@ -1555,14 +1589,18 @@ mld_set_timeout(struct mld_tparams *mtp)
 
        if (mtp->qpt != 0 || mtp->it != 0 || mtp->cst != 0 || mtp->sct != 0) {
                MLD_LOCK();
 
        if (mtp->qpt != 0 || mtp->it != 0 || mtp->cst != 0 || mtp->sct != 0) {
                MLD_LOCK();

-               if (mtp->qpt != 0)
+               if (mtp->qpt != 0) {

                        querier_present_timers_running6 = 1;
                        querier_present_timers_running6 = 1;

-               if (mtp->it != 0)
+               }
+               if (mtp->it != 0) {

                        interface_timers_running6 = 1;
                        interface_timers_running6 = 1;

-               if (mtp->cst != 0)
+               }
+               if (mtp->cst != 0) {

                        current_state_timers_running6 = 1;
                        current_state_timers_running6 = 1;

-               if (mtp->sct != 0)
+               }
+               if (mtp->sct != 0) {

                        state_change_timers_running6 = 1;
                        state_change_timers_running6 = 1;

+               }

                mld_sched_timeout();
                MLD_UNLOCK();
        }
                mld_sched_timeout();
                MLD_UNLOCK();
        }


@@ -1575,15 +1613,15 @@ static void
 mld_timeout(void *arg)
 {
 #pragma unused(arg)
 mld_timeout(void *arg)
 {
 #pragma unused(arg)

-       struct ifqueue           scq;   /* State-change packets */
-       struct ifqueue           qrq;   /* Query response packets */
-       struct ifnet            *ifp;
-       struct mld_ifinfo       *mli;
-       struct in6_multi        *inm;
-       int                      uri_sec = 0;
+       struct ifqueue           scq;   /* State-change packets */
+       struct ifqueue           qrq;   /* Query response packets */
+       struct ifnet            *ifp;
+       struct mld_ifinfo       *mli;
+       struct in6_multi        *inm;
+       int                      uri_sec = 0;

        unsigned int genid = mld_mli_list_genid;
 
        unsigned int genid = mld_mli_list_genid;
 

-       SLIST_HEAD(, in6_multi) in6m_dthead;
+       SLIST_HEAD(, in6_multi) in6m_dthead;

 
        SLIST_INIT(&in6m_dthead);
 
 
        SLIST_INIT(&in6m_dthead);
 


@@ -1608,8 +1646,9 @@ mld_timeout(void *arg)
                LIST_FOREACH(mli, &mli_head, mli_link) {
                        MLI_LOCK(mli);
                        mld_v1_process_querier_timers(mli);
                LIST_FOREACH(mli, &mli_head, mli_link) {
                        MLI_LOCK(mli);
                        mld_v1_process_querier_timers(mli);

-                       if (mli->mli_v1_timer > 0)
+                       if (mli->mli_v1_timer > 0) {

                                querier_present_timers_running6 = 1;
                                querier_present_timers_running6 = 1;

+                       }

                        MLI_UNLOCK(mli);
                }
        }
                        MLI_UNLOCK(mli);
                }
        }


@@ -1647,8 +1686,9 @@ mld_timeout(void *arg)
                        if (mli->mli_v2_timer == 0) {
                                /* Do nothing. */
                        } else if (--mli->mli_v2_timer == 0) {
                        if (mli->mli_v2_timer == 0) {
                                /* Do nothing. */
                        } else if (--mli->mli_v2_timer == 0) {

-                               if (mld_v2_dispatch_general_query(mli) > 0)
+                               if (mld_v2_dispatch_general_query(mli) > 0) {

                                        interface_timers_running6 = 1;
                                        interface_timers_running6 = 1;

+                               }

                        } else {
                                interface_timers_running6 = 1;
                        }
                        } else {
                                interface_timers_running6 = 1;
                        }


@@ -1668,14 +1708,15 @@ mld_timeout(void *arg)
                }
 
                LIST_FOREACH(mli, &mli_head, mli_link)
                }
 
                LIST_FOREACH(mli, &mli_head, mli_link)

-                       mli->mli_flags &= ~MLIF_PROCESSED;
+               mli->mli_flags &= ~MLIF_PROCESSED;

        }
 
 
 
        if (!current_state_timers_running6 &&
        }
 
 
 
        if (!current_state_timers_running6 &&

-           !state_change_timers_running6)
+           !state_change_timers_running6) {

                goto out_locked;
                goto out_locked;

+       }

 
        current_state_timers_running6 = 0;
        state_change_timers_running6 = 0;
 
        current_state_timers_running6 = 0;
        state_change_timers_running6 = 0;


@@ -1711,8 +1752,9 @@ mld_timeout(void *arg)
                IN6_FIRST_MULTI(step, inm);
                while (inm != NULL) {
                        IN6M_LOCK(inm);
                IN6_FIRST_MULTI(step, inm);
                while (inm != NULL) {
                        IN6M_LOCK(inm);

-                       if (inm->in6m_ifp != ifp)
+                       if (inm->in6m_ifp != ifp) {

                                goto next;
                                goto next;

+                       }

 
                        MLI_LOCK(mli);
                        switch (mli->mli_version) {
 
                        MLI_LOCK(mli);
                        switch (mli->mli_version) {


@@ -1784,7 +1826,7 @@ next:
        }
 
        LIST_FOREACH(mli, &mli_head, mli_link)
        }
 
        LIST_FOREACH(mli, &mli_head, mli_link)

-               mli->mli_flags &= ~MLIF_PROCESSED;
+       mli->mli_flags &= ~MLIF_PROCESSED;

 
 out_locked:
        /* re-arm the timer if there's work to do */
 
 out_locked:
        /* re-arm the timer if there's work to do */


@@ -1892,7 +1934,7 @@ mld_v1_process_group_timer(struct in6_multi *inm, const int mld_version)
                if (report_timer_expired) {
                        inm->in6m_state = MLD_IDLE_MEMBER;
                        (void) mld_v1_transmit_report(inm,
                if (report_timer_expired) {
                        inm->in6m_state = MLD_IDLE_MEMBER;
                        (void) mld_v1_transmit_report(inm,

-                            MLD_LISTENER_REPORT);
+                           MLD_LISTENER_REPORT);

                        IN6M_LOCK_ASSERT_HELD(inm);
                        MLI_LOCK_ASSERT_HELD(inm->in6m_mli);
                }
                        IN6M_LOCK_ASSERT_HELD(inm);
                        MLI_LOCK_ASSERT_HELD(inm->in6m_mli);
                }


@@ -1951,8 +1993,9 @@ mld_v2_process_group_timers(struct mld_ifinfo *mli,
 
        /* We are in timer callback, so be quick about it. */
        if (!state_change_retransmit_timer_expired &&
 
        /* We are in timer callback, so be quick about it. */
        if (!state_change_retransmit_timer_expired &&

-           !query_response_timer_expired)
+           !query_response_timer_expired) {

                return;
                return;

+       }

 
        switch (inm->in6m_state) {
        case MLD_NOT_MEMBER:
 
        switch (inm->in6m_state) {
        case MLD_NOT_MEMBER:


@@ -1981,7 +2024,7 @@ mld_v2_process_group_timers(struct mld_ifinfo *mli,
                        inm->in6m_state = MLD_REPORTING_MEMBER;
                        in6m_clear_recorded(inm);
                }
                        inm->in6m_state = MLD_REPORTING_MEMBER;
                        in6m_clear_recorded(inm);
                }

-               /* FALLTHROUGH */
+       /* FALLTHROUGH */

        case MLD_REPORTING_MEMBER:
        case MLD_LEAVING_MEMBER:
                if (state_change_retransmit_timer_expired) {
        case MLD_REPORTING_MEMBER:
        case MLD_LEAVING_MEMBER:
                if (state_change_retransmit_timer_expired) {


@@ -2069,7 +2112,7 @@ mld_set_version(struct mld_ifinfo *mli, const int mld_version)
 
        MLI_LOCK_ASSERT_HELD(mli);
 
 
        MLI_LOCK_ASSERT_HELD(mli);
 

-       return (mli->mli_v1_timer);
+       return mli->mli_v1_timer;

 }
 
 /*
 }
 
 /*


@@ -2084,9 +2127,9 @@ mld_set_version(struct mld_ifinfo *mli, const int mld_version)
 static void
 mld_v2_cancel_link_timers(struct mld_ifinfo *mli)
 {
 static void
 mld_v2_cancel_link_timers(struct mld_ifinfo *mli)
 {

-       struct ifnet            *ifp;
-       struct in6_multi        *inm;
-       struct in6_multistep    step;
+       struct ifnet            *ifp;
+       struct in6_multi        *inm;
+       struct in6_multistep    step;

 
        MLI_LOCK_ASSERT_HELD(mli);
 
 
        MLI_LOCK_ASSERT_HELD(mli);
 


@@ -2111,8 +2154,9 @@ mld_v2_cancel_link_timers(struct mld_ifinfo *mli)
        IN6_FIRST_MULTI(step, inm);
        while (inm != NULL) {
                IN6M_LOCK(inm);
        IN6_FIRST_MULTI(step, inm);
        while (inm != NULL) {
                IN6M_LOCK(inm);

-               if (inm->in6m_ifp != ifp)
+               if (inm->in6m_ifp != ifp) {

                        goto next;
                        goto next;

+               }

 
                switch (inm->in6m_state) {
                case MLD_NOT_MEMBER:
 
                switch (inm->in6m_state) {
                case MLD_NOT_MEMBER:


@@ -2141,11 +2185,11 @@ mld_v2_cancel_link_timers(struct mld_ifinfo *mli)
                        SLIST_INSERT_HEAD(&mli->mli_relinmhead, inm,
                            in6m_nrele);
                        MLI_UNLOCK(mli);
                        SLIST_INSERT_HEAD(&mli->mli_relinmhead, inm,
                            in6m_nrele);
                        MLI_UNLOCK(mli);

-                       /* FALLTHROUGH */
+               /* FALLTHROUGH */

                case MLD_G_QUERY_PENDING_MEMBER:
                case MLD_SG_QUERY_PENDING_MEMBER:
                        in6m_clear_recorded(inm);
                case MLD_G_QUERY_PENDING_MEMBER:
                case MLD_SG_QUERY_PENDING_MEMBER:
                        in6m_clear_recorded(inm);

-                       /* FALLTHROUGH */
+               /* FALLTHROUGH */

                case MLD_REPORTING_MEMBER:
                        inm->in6m_state = MLD_REPORTING_MEMBER;
                        break;
                case MLD_REPORTING_MEMBER:
                        inm->in6m_state = MLD_REPORTING_MEMBER;
                        break;


@@ -2194,32 +2238,34 @@ mld_v1_process_querier_timers(struct mld_ifinfo *mli)
 static int
 mld_v1_transmit_report(struct in6_multi *in6m, const int type)
 {
 static int
 mld_v1_transmit_report(struct in6_multi *in6m, const int type)
 {

-       struct ifnet            *ifp;
-       struct in6_ifaddr       *ia;
-       struct ip6_hdr          *ip6;
-       struct mbuf             *mh, *md;
-       struct mld_hdr          *mld;
-       int                     error = 0;
+       struct ifnet            *ifp;
+       struct in6_ifaddr       *ia;
+       struct ip6_hdr          *ip6;
+       struct mbuf             *mh, *md;
+       struct mld_hdr          *mld;
+       int                     error = 0;

 
        IN6M_LOCK_ASSERT_HELD(in6m);
        MLI_LOCK_ASSERT_HELD(in6m->in6m_mli);
 
        ifp = in6m->in6m_ifp;
        /* ia may be NULL if link-local address is tentative. */
 
        IN6M_LOCK_ASSERT_HELD(in6m);
        MLI_LOCK_ASSERT_HELD(in6m->in6m_mli);
 
        ifp = in6m->in6m_ifp;
        /* ia may be NULL if link-local address is tentative. */

-       ia = in6ifa_ifpforlinklocal(ifp, IN6_IFF_NOTREADY|IN6_IFF_ANYCAST);
+       ia = in6ifa_ifpforlinklocal(ifp, IN6_IFF_NOTREADY | IN6_IFF_ANYCAST);

 
        MGETHDR(mh, M_DONTWAIT, MT_HEADER);
        if (mh == NULL) {
 
        MGETHDR(mh, M_DONTWAIT, MT_HEADER);
        if (mh == NULL) {

-               if (ia != NULL)
+               if (ia != NULL) {

                        IFA_REMREF(&ia->ia_ifa);
                        IFA_REMREF(&ia->ia_ifa);

-               return (ENOMEM);
+               }
+               return ENOMEM;

        }
        MGET(md, M_DONTWAIT, MT_DATA);
        if (md == NULL) {
                m_free(mh);
        }
        MGET(md, M_DONTWAIT, MT_DATA);
        if (md == NULL) {
                m_free(mh);

-               if (ia != NULL)
+               if (ia != NULL) {

                        IFA_REMREF(&ia->ia_ifa);
                        IFA_REMREF(&ia->ia_ifa);

-               return (ENOMEM);
+               }
+               return ENOMEM;

        }
        mh->m_next = md;
 
        }
        mh->m_next = md;
 


@@ -2237,8 +2283,9 @@ mld_v1_transmit_report(struct in6_multi *in6m, const int type)
        ip6->ip6_vfc &= ~IPV6_VERSION_MASK;
        ip6->ip6_vfc |= IPV6_VERSION;
        ip6->ip6_nxt = IPPROTO_ICMPV6;
        ip6->ip6_vfc &= ~IPV6_VERSION_MASK;
        ip6->ip6_vfc |= IPV6_VERSION;
        ip6->ip6_nxt = IPPROTO_ICMPV6;

-       if (ia != NULL)
+       if (ia != NULL) {

                IFA_LOCK(&ia->ia_ifa);
                IFA_LOCK(&ia->ia_ifa);

+       }

        ip6->ip6_src = ia ? ia->ia_addr.sin6_addr : in6addr_any;
        if (ia != NULL) {
                IFA_UNLOCK(&ia->ia_ifa);
        ip6->ip6_src = ia ? ia->ia_addr.sin6_addr : in6addr_any;
        if (ia != NULL) {
                IFA_UNLOCK(&ia->ia_ifa);


@@ -2271,16 +2318,16 @@ mld_v1_transmit_report(struct in6_multi *in6m, const int type)
         * Instead we defer the work to the mld_timeout() thread, thus
         * avoiding unlocking in_multihead_lock here.
         */
         * Instead we defer the work to the mld_timeout() thread, thus
         * avoiding unlocking in_multihead_lock here.
         */

-        if (IF_QFULL(&in6m->in6m_mli->mli_v1q)) {
-                MLD_PRINTF(("%s: v1 outbound queue full\n", __func__));
-                error = ENOMEM;
-                m_freem(mh);
-        } else {
-                IF_ENQUEUE(&in6m->in6m_mli->mli_v1q, mh);
+       if (IF_QFULL(&in6m->in6m_mli->mli_v1q)) {
+               MLD_PRINTF(("%s: v1 outbound queue full\n", __func__));
+               error = ENOMEM;
+               m_freem(mh);
+       } else {
+               IF_ENQUEUE(&in6m->in6m_mli->mli_v1q, mh);

                VERIFY(error == 0);
        }
 
                VERIFY(error == 0);
        }
 

-       return (error);
+       return error;

 }
 
 /*
 }
 
 /*


@@ -2312,7 +2359,7 @@ mld_change_state(struct in6_multi *inm, struct mld_tparams *mtp,
        int error = 0;
 
        VERIFY(mtp != NULL);
        int error = 0;
 
        VERIFY(mtp != NULL);

-       bzero(mtp, sizeof (*mtp));
+       bzero(mtp, sizeof(*mtp));

 
        IN6M_LOCK_ASSERT_HELD(inm);
        VERIFY(inm->in6m_mli != NULL);
 
        IN6M_LOCK_ASSERT_HELD(inm);
        VERIFY(inm->in6m_mli != NULL);


@@ -2355,7 +2402,7 @@ mld_change_state(struct in6_multi *inm, struct mld_tparams *mtp,
 
        error = mld_handle_state_change(inm, mli, mtp);
 out:
 
        error = mld_handle_state_change(inm, mli, mtp);
 out:

-       return (error);
+       return error;

 }
 
 /*
 }
 
 /*


@@ -2374,10 +2421,10 @@ static int
 mld_initial_join(struct in6_multi *inm, struct mld_ifinfo *mli,
     struct mld_tparams *mtp, const int delay)
 {
 mld_initial_join(struct in6_multi *inm, struct mld_ifinfo *mli,
     struct mld_tparams *mtp, const int delay)
 {

-       struct ifnet            *ifp;
-       struct ifqueue          *ifq;
-       int                      error, retval, syncstates;
-       int                      odelay;
+       struct ifnet            *ifp;
+       struct ifqueue          *ifq;
+       int                      error, retval, syncstates;
+       int                      odelay;

 
        IN6M_LOCK_ASSERT_HELD(inm);
        MLI_LOCK_ASSERT_NOTHELD(mli);
 
        IN6M_LOCK_ASSERT_HELD(inm);
        MLI_LOCK_ASSERT_NOTHELD(mli);


@@ -2410,7 +2457,7 @@ mld_initial_join(struct in6_multi *inm, struct mld_ifinfo *mli,
        if ((ifp->if_flags & IFF_LOOPBACK) ||
            (mli->mli_flags & MLIF_SILENT) ||
            (IFNET_IS_CELLULAR(ifp) &&
        if ((ifp->if_flags & IFF_LOOPBACK) ||
            (mli->mli_flags & MLIF_SILENT) ||
            (IFNET_IS_CELLULAR(ifp) &&

-            IN6_IS_ADDR_MC_LINKLOCAL(&inm->in6m_addr)) ||
+           IN6_IS_ADDR_MC_LINKLOCAL(&inm->in6m_addr)) ||

            !mld_is_addr_reported(&inm->in6m_addr)) {
                MLD_PRINTF(("%s: not kicking state machine for silent group\n",
                    __func__));
            !mld_is_addr_reported(&inm->in6m_addr)) {
                MLD_PRINTF(("%s: not kicking state machine for silent group\n",
                    __func__));


@@ -2450,7 +2497,7 @@ mld_initial_join(struct in6_multi *inm, struct mld_ifinfo *mli,
                        } else {
                                inm->in6m_state = MLD_IDLE_MEMBER;
                                error = mld_v1_transmit_report(inm,
                        } else {
                                inm->in6m_state = MLD_IDLE_MEMBER;
                                error = mld_v1_transmit_report(inm,

-                                    MLD_LISTENER_REPORT);
+                                   MLD_LISTENER_REPORT);

 
                                IN6M_LOCK_ASSERT_HELD(inm);
                                MLI_LOCK_ASSERT_HELD(mli);
 
                                IN6M_LOCK_ASSERT_HELD(inm);
                                MLI_LOCK_ASSERT_HELD(mli);


@@ -2502,8 +2549,9 @@ mld_initial_join(struct in6_multi *inm, struct mld_ifinfo *mli,
                                if (inm->in6m_sctimer > 1) {
                                        inm->in6m_sctimer =
                                            min(inm->in6m_sctimer, delay);
                                if (inm->in6m_sctimer > 1) {
                                        inm->in6m_sctimer =
                                            min(inm->in6m_sctimer, delay);

-                               } else
+                               } else {

                                        inm->in6m_sctimer = delay;
                                        inm->in6m_sctimer = delay;

+                               }

                        } else {
                                inm->in6m_sctimer = 1;
                        }
                        } else {
                                inm->in6m_sctimer = 1;
                        }


@@ -2526,7 +2574,7 @@ mld_initial_join(struct in6_multi *inm, struct mld_ifinfo *mli,
                    if_name(inm->in6m_ifp)));
        }
 
                    if_name(inm->in6m_ifp)));
        }
 

-       return (error);
+       return error;

 }
 
 /*
 }
 
 /*


@@ -2536,8 +2584,8 @@ static int
 mld_handle_state_change(struct in6_multi *inm, struct mld_ifinfo *mli,
     struct mld_tparams *mtp)
 {
 mld_handle_state_change(struct in6_multi *inm, struct mld_ifinfo *mli,
     struct mld_tparams *mtp)
 {

-       struct ifnet            *ifp;
-       int                      retval = 0;
+       struct ifnet            *ifp;
+       int                      retval = 0;

 
        IN6M_LOCK_ASSERT_HELD(inm);
        MLI_LOCK_ASSERT_NOTHELD(mli);
 
        IN6M_LOCK_ASSERT_HELD(inm);
        MLI_LOCK_ASSERT_NOTHELD(mli);


@@ -2594,7 +2642,7 @@ mld_handle_state_change(struct in6_multi *inm, struct mld_ifinfo *mli,
        MLI_UNLOCK(mli);
 
 done:
        MLI_UNLOCK(mli);
 
 done:

-       return (retval);
+       return retval;

 }
 
 /*
 }
 
 /*


@@ -2682,12 +2730,12 @@ mld_final_leave(struct in6_multi *inm, struct mld_ifinfo *mli,
                                VERIFY(inm->in6m_nrelecnt != 0);
 
                                retval = mld_v2_enqueue_group_record(
                                VERIFY(inm->in6m_nrelecnt != 0);
 
                                retval = mld_v2_enqueue_group_record(

-                                   &inm->in6m_scq, inm, 1, 0, 0,
-                                   (mli->mli_flags & MLIF_USEALLOW));
+                                       &inm->in6m_scq, inm, 1, 0, 0,
+                                       (mli->mli_flags & MLIF_USEALLOW));

                                mtp->cst = (inm->in6m_scq.ifq_len > 0);
                                KASSERT(retval != 0,
                                    ("%s: enqueue record = %d\n", __func__,
                                mtp->cst = (inm->in6m_scq.ifq_len > 0);
                                KASSERT(retval != 0,
                                    ("%s: enqueue record = %d\n", __func__,

-                                    retval));
+                                   retval));

 
                                inm->in6m_state = MLD_LEAVING_MEMBER;
                                inm->in6m_sctimer = 1;
 
                                inm->in6m_state = MLD_LEAVING_MEMBER;
                                inm->in6m_sctimer = 1;


@@ -2748,17 +2796,17 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
     const int is_state_change, const int is_group_query,
     const int is_source_query, const int use_block_allow)
 {
     const int is_state_change, const int is_group_query,
     const int is_source_query, const int use_block_allow)
 {

-       struct mldv2_record      mr;
-       struct mldv2_record     *pmr;
-       struct ifnet            *ifp;
-       struct ip6_msource      *ims, *nims;
-       struct mbuf             *m0, *m, *md;
-       int                      error, is_filter_list_change;
-       int                      minrec0len, m0srcs, msrcs, nbytes, off;
-       int                      record_has_sources;
-       int                      now;
-       int                      type;
-       uint8_t                  mode;
+       struct mldv2_record      mr;
+       struct mldv2_record     *pmr;
+       struct ifnet            *ifp;
+       struct ip6_msource      *ims, *nims;
+       struct mbuf             *m0, *m, *md;
+       int                      error, is_filter_list_change;
+       int                      minrec0len, m0srcs, msrcs, nbytes, off;
+       int                      record_has_sources;
+       int                      now;
+       int                      type;
+       uint8_t                  mode;

 
        IN6M_LOCK_ASSERT_HELD(inm);
        MLI_LOCK_ASSERT_HELD(inm->in6m_mli);
 
        IN6M_LOCK_ASSERT_HELD(inm);
        MLI_LOCK_ASSERT_HELD(inm->in6m_mli);


@@ -2783,8 +2831,9 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
         * the generation of source records.
         */
        if (inm->in6m_st[0].iss_asm > 0 && inm->in6m_st[1].iss_asm > 0 &&
         * the generation of source records.
         */
        if (inm->in6m_st[0].iss_asm > 0 && inm->in6m_st[1].iss_asm > 0 &&

-           inm->in6m_nsrc == 0)
+           inm->in6m_nsrc == 0) {

                record_has_sources = 0;
                record_has_sources = 0;

+       }

 
        if (is_state_change) {
                /*
 
        if (is_state_change) {
                /*


@@ -2828,8 +2877,9 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
                                        }
                                } else {
                                        type = MLD_CHANGE_TO_INCLUDE_MODE;
                                        }
                                } else {
                                        type = MLD_CHANGE_TO_INCLUDE_MODE;

-                                       if (mode == MCAST_UNDEFINED)
+                                       if (mode == MCAST_UNDEFINED) {

                                                record_has_sources = 0;
                                                record_has_sources = 0;

+                                       }

                                }
                        }
                } else {
                                }
                        }
                } else {


@@ -2854,14 +2904,15 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
        /*
         * Generate the filter list changes using a separate function.
         */
        /*
         * Generate the filter list changes using a separate function.
         */

-       if (is_filter_list_change)
-               return (mld_v2_enqueue_filter_change(ifq, inm));
+       if (is_filter_list_change) {
+               return mld_v2_enqueue_filter_change(ifq, inm);
+       }

 
        if (type == MLD_DO_NOTHING) {
                MLD_PRINTF(("%s: nothing to do for %s/%s\n",
                    __func__, ip6_sprintf(&inm->in6m_addr),
                    if_name(inm->in6m_ifp)));
 
        if (type == MLD_DO_NOTHING) {
                MLD_PRINTF(("%s: nothing to do for %s/%s\n",
                    __func__, ip6_sprintf(&inm->in6m_addr),
                    if_name(inm->in6m_ifp)));

-               return (0);
+               return 0;

        }
 
        /*
        }
 
        /*


@@ -2870,8 +2921,9 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
         * ideally more.
         */
        minrec0len = sizeof(struct mldv2_record);
         * ideally more.
         */
        minrec0len = sizeof(struct mldv2_record);

-       if (record_has_sources)
+       if (record_has_sources) {

                minrec0len += sizeof(struct in6_addr);
                minrec0len += sizeof(struct in6_addr);

+       }

        MLD_PRINTF(("%s: queueing %s for %s/%s\n", __func__,
            mld_rec_type_to_str(type),
            ip6_sprintf(&inm->in6m_addr),
        MLD_PRINTF(("%s: queueing %s for %s/%s\n", __func__,
            mld_rec_type_to_str(type),
            ip6_sprintf(&inm->in6m_addr),


@@ -2890,26 +2942,29 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
            m0 != NULL &&
            (m0->m_pkthdr.vt_nrecs + 1 <= MLD_V2_REPORT_MAXRECS) &&
            (m0->m_pkthdr.len + minrec0len) <
            m0 != NULL &&
            (m0->m_pkthdr.vt_nrecs + 1 <= MLD_V2_REPORT_MAXRECS) &&
            (m0->m_pkthdr.len + minrec0len) <

-            (ifp->if_mtu - MLD_MTUSPACE)) {
+           (ifp->if_mtu - MLD_MTUSPACE)) {

                m0srcs = (ifp->if_mtu - m0->m_pkthdr.len -
                m0srcs = (ifp->if_mtu - m0->m_pkthdr.len -

-                           sizeof(struct mldv2_record)) /
-                           sizeof(struct in6_addr);
+                   sizeof(struct mldv2_record)) /
+                   sizeof(struct in6_addr);

                m = m0;
                MLD_PRINTF(("%s: use existing packet\n", __func__));
        } else {
                if (IF_QFULL(ifq)) {
                        MLD_PRINTF(("%s: outbound queue full\n", __func__));
                m = m0;
                MLD_PRINTF(("%s: use existing packet\n", __func__));
        } else {
                if (IF_QFULL(ifq)) {
                        MLD_PRINTF(("%s: outbound queue full\n", __func__));

-                       return (-ENOMEM);
+                       return -ENOMEM;

                }
                m = NULL;
                m0srcs = (ifp->if_mtu - MLD_MTUSPACE -
                    sizeof(struct mldv2_record)) / sizeof(struct in6_addr);
                }
                m = NULL;
                m0srcs = (ifp->if_mtu - MLD_MTUSPACE -
                    sizeof(struct mldv2_record)) / sizeof(struct in6_addr);

-               if (!is_state_change && !is_group_query)
+               if (!is_state_change && !is_group_query) {

                        m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
                        m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);

-               if (m == NULL)
+               }
+               if (m == NULL) {

                        m = m_gethdr(M_DONTWAIT, MT_DATA);
                        m = m_gethdr(M_DONTWAIT, MT_DATA);

-               if (m == NULL)
-                       return (-ENOMEM);
+               }
+               if (m == NULL) {
+                       return -ENOMEM;
+               }

 
                mld_save_context(m, ifp);
 
 
                mld_save_context(m, ifp);
 


@@ -2926,10 +2981,11 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
        mr.mr_addr = inm->in6m_addr;
        in6_clearscope(&mr.mr_addr);
        if (!m_append(m, sizeof(struct mldv2_record), (void *)&mr)) {
        mr.mr_addr = inm->in6m_addr;
        in6_clearscope(&mr.mr_addr);
        if (!m_append(m, sizeof(struct mldv2_record), (void *)&mr)) {

-               if (m != m0)
+               if (m != m0) {

                        m_freem(m);
                        m_freem(m);

+               }

                MLD_PRINTF(("%s: m_append() failed.\n", __func__));
                MLD_PRINTF(("%s: m_append() failed.\n", __func__));

-               return (-ENOMEM);
+               return -ENOMEM;

        }
        nbytes += sizeof(struct mldv2_record);
 
        }
        nbytes += sizeof(struct mldv2_record);
 


@@ -2968,7 +3024,7 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
                        MLD_PRINTF(("%s: node is %d\n", __func__, now));
                        if ((now != mode) ||
                            (now == mode &&
                        MLD_PRINTF(("%s: node is %d\n", __func__, now));
                        if ((now != mode) ||
                            (now == mode &&

-                            (!use_block_allow && mode == MCAST_UNDEFINED))) {
+                           (!use_block_allow && mode == MCAST_UNDEFINED))) {

                                MLD_PRINTF(("%s: skip node\n", __func__));
                                continue;
                        }
                                MLD_PRINTF(("%s: skip node\n", __func__));
                                continue;
                        }


@@ -2980,16 +3036,18 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
                        MLD_PRINTF(("%s: append node\n", __func__));
                        if (!m_append(m, sizeof(struct in6_addr),
                            (void *)&ims->im6s_addr)) {
                        MLD_PRINTF(("%s: append node\n", __func__));
                        if (!m_append(m, sizeof(struct in6_addr),
                            (void *)&ims->im6s_addr)) {

-                               if (m != m0)
+                               if (m != m0) {

                                        m_freem(m);
                                        m_freem(m);

+                               }

                                MLD_PRINTF(("%s: m_append() failed.\n",
                                    __func__));
                                MLD_PRINTF(("%s: m_append() failed.\n",
                                    __func__));

-                               return (-ENOMEM);
+                               return -ENOMEM;

                        }
                        nbytes += sizeof(struct in6_addr);
                        ++msrcs;
                        }
                        nbytes += sizeof(struct in6_addr);
                        ++msrcs;

-                       if (msrcs == m0srcs)
+                       if (msrcs == m0srcs) {

                                break;
                                break;

+                       }

                }
                MLD_PRINTF(("%s: msrcs is %d this packet\n", __func__,
                    msrcs));
                }
                MLD_PRINTF(("%s: msrcs is %d this packet\n", __func__,
                    msrcs));


@@ -2999,9 +3057,10 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
 
        if (is_source_query && msrcs == 0) {
                MLD_PRINTF(("%s: no recorded sources to report\n", __func__));
 
        if (is_source_query && msrcs == 0) {
                MLD_PRINTF(("%s: no recorded sources to report\n", __func__));

-               if (m != m0)
+               if (m != m0) {

                        m_freem(m);
                        m_freem(m);

-               return (0);
+               }
+               return 0;

        }
 
        /*
        }
 
        /*


@@ -3017,8 +3076,9 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
        /*
         * No further work needed if no source list in packet(s).
         */
        /*
         * No further work needed if no source list in packet(s).
         */

-       if (!record_has_sources)
-               return (nbytes);
+       if (!record_has_sources) {
+               return nbytes;
+       }

 
        /*
         * Whilst sources remain to be announced, we need to allocate
 
        /*
         * Whilst sources remain to be announced, we need to allocate


@@ -3028,23 +3088,26 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
        while (nims != NULL) {
                if (IF_QFULL(ifq)) {
                        MLD_PRINTF(("%s: outbound queue full\n", __func__));
        while (nims != NULL) {
                if (IF_QFULL(ifq)) {
                        MLD_PRINTF(("%s: outbound queue full\n", __func__));

-                       return (-ENOMEM);
+                       return -ENOMEM;

                }
                m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
                }
                m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);

-               if (m == NULL)
+               if (m == NULL) {

                        m = m_gethdr(M_DONTWAIT, MT_DATA);
                        m = m_gethdr(M_DONTWAIT, MT_DATA);

-               if (m == NULL)
-                       return (-ENOMEM);
+               }
+               if (m == NULL) {
+                       return -ENOMEM;
+               }

                mld_save_context(m, ifp);
                md = m_getptr(m, 0, &off);
                pmr = (struct mldv2_record *)(mtod(md, uint8_t *) + off);
                MLD_PRINTF(("%s: allocated next packet\n", __func__));
 
                if (!m_append(m, sizeof(struct mldv2_record), (void *)&mr)) {
                mld_save_context(m, ifp);
                md = m_getptr(m, 0, &off);
                pmr = (struct mldv2_record *)(mtod(md, uint8_t *) + off);
                MLD_PRINTF(("%s: allocated next packet\n", __func__));
 
                if (!m_append(m, sizeof(struct mldv2_record), (void *)&mr)) {

-                       if (m != m0)
+                       if (m != m0) {

                                m_freem(m);
                                m_freem(m);

+                       }

                        MLD_PRINTF(("%s: m_append() failed.\n", __func__));
                        MLD_PRINTF(("%s: m_append() failed.\n", __func__));

-                       return (-ENOMEM);
+                       return -ENOMEM;

                }
                m->m_pkthdr.vt_nrecs = 1;
                nbytes += sizeof(struct mldv2_record);
                }
                m->m_pkthdr.vt_nrecs = 1;
                nbytes += sizeof(struct mldv2_record);


@@ -3059,7 +3122,7 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
                        now = im6s_get_mode(inm, ims, 1);
                        if ((now != mode) ||
                            (now == mode &&
                        now = im6s_get_mode(inm, ims, 1);
                        if ((now != mode) ||
                            (now == mode &&

-                            (!use_block_allow && mode == MCAST_UNDEFINED))) {
+                           (!use_block_allow && mode == MCAST_UNDEFINED))) {

                                MLD_PRINTF(("%s: skip node\n", __func__));
                                continue;
                        }
                                MLD_PRINTF(("%s: skip node\n", __func__));
                                continue;
                        }


@@ -3071,15 +3134,17 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
                        MLD_PRINTF(("%s: append node\n", __func__));
                        if (!m_append(m, sizeof(struct in6_addr),
                            (void *)&ims->im6s_addr)) {
                        MLD_PRINTF(("%s: append node\n", __func__));
                        if (!m_append(m, sizeof(struct in6_addr),
                            (void *)&ims->im6s_addr)) {

-                               if (m != m0)
+                               if (m != m0) {

                                        m_freem(m);
                                        m_freem(m);

+                               }

                                MLD_PRINTF(("%s: m_append() failed.\n",
                                    __func__));
                                MLD_PRINTF(("%s: m_append() failed.\n",
                                    __func__));

-                               return (-ENOMEM);
+                               return -ENOMEM;

                        }
                        ++msrcs;
                        }
                        ++msrcs;

-                       if (msrcs == m0srcs)
+                       if (msrcs == m0srcs) {

                                break;
                                break;

+                       }

                }
                pmr->mr_numsrc = htons(msrcs);
                nbytes += (msrcs * sizeof(struct in6_addr));
                }
                pmr->mr_numsrc = htons(msrcs);
                nbytes += (msrcs * sizeof(struct in6_addr));


@@ -3088,7 +3153,7 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
                IF_ENQUEUE(ifq, m);
        }
 
                IF_ENQUEUE(ifq, m);
        }
 

-       return (nbytes);
+       return nbytes;

 }
 
 /*
 }
 
 /*


@@ -3097,9 +3162,9 @@ mld_v2_enqueue_group_record(struct ifqueue *ifq, struct in6_multi *inm,
  * current filter modes on each ip_msource node.
  */
 typedef enum {
  * current filter modes on each ip_msource node.
  */
 typedef enum {

-       REC_NONE = 0x00,        /* MCAST_UNDEFINED */
-       REC_ALLOW = 0x01,       /* MCAST_INCLUDE */
-       REC_BLOCK = 0x02,       /* MCAST_EXCLUDE */
+       REC_NONE = 0x00,        /* MCAST_UNDEFINED */
+       REC_ALLOW = 0x01,       /* MCAST_INCLUDE */
+       REC_BLOCK = 0x02,       /* MCAST_EXCLUDE */

        REC_FULL = REC_ALLOW | REC_BLOCK
 } rectype_t;
 
        REC_FULL = REC_ALLOW | REC_BLOCK
 } rectype_t;
 


@@ -3129,35 +3194,36 @@ mld_v2_enqueue_filter_change(struct ifqueue *ifq, struct in6_multi *inm)
 {
        static const int MINRECLEN =
            sizeof(struct mldv2_record) + sizeof(struct in6_addr);
 {
        static const int MINRECLEN =
            sizeof(struct mldv2_record) + sizeof(struct in6_addr);

-       struct ifnet            *ifp;
-       struct mldv2_record      mr;
-       struct mldv2_record     *pmr;
-       struct ip6_msource      *ims, *nims;
-       struct mbuf             *m, *m0, *md;
-       int                      m0srcs, nbytes, npbytes, off, rsrcs, schanged;
-       int                      nallow, nblock;
-       uint8_t                  mode, now, then;
-       rectype_t                crt, drt, nrt;
+       struct ifnet            *ifp;
+       struct mldv2_record      mr;
+       struct mldv2_record     *pmr;
+       struct ip6_msource      *ims, *nims;
+       struct mbuf             *m, *m0, *md;
+       int                      m0srcs, nbytes, npbytes, off, rsrcs, schanged;
+       int                      nallow, nblock;
+       uint8_t                  mode, now, then;
+       rectype_t                crt, drt, nrt;

 
        IN6M_LOCK_ASSERT_HELD(inm);
 
        if (inm->in6m_nsrc == 0 ||
 
        IN6M_LOCK_ASSERT_HELD(inm);
 
        if (inm->in6m_nsrc == 0 ||

-           (inm->in6m_st[0].iss_asm > 0 && inm->in6m_st[1].iss_asm > 0))
-               return (0);
-
-       ifp = inm->in6m_ifp;                    /* interface */
-       mode = inm->in6m_st[1].iss_fmode;       /* filter mode at t1 */
-       crt = REC_NONE; /* current group record type */
-       drt = REC_NONE; /* mask of completed group record types */
-       nrt = REC_NONE; /* record type for current node */
-       m0srcs = 0;     /* # source which will fit in current mbuf chain */
-       npbytes = 0;    /* # of bytes appended this packet */
-       nbytes = 0;     /* # of bytes appended to group's state-change queue */
-       rsrcs = 0;      /* # sources encoded in current record */
-       schanged = 0;   /* # nodes encoded in overall filter change */
-       nallow = 0;     /* # of source entries in ALLOW_NEW */
-       nblock = 0;     /* # of source entries in BLOCK_OLD */
-       nims = NULL;    /* next tree node pointer */
+           (inm->in6m_st[0].iss_asm > 0 && inm->in6m_st[1].iss_asm > 0)) {
+               return 0;
+       }
+
+       ifp = inm->in6m_ifp;                    /* interface */
+       mode = inm->in6m_st[1].iss_fmode;       /* filter mode at t1 */
+       crt = REC_NONE; /* current group record type */
+       drt = REC_NONE; /* mask of completed group record types */
+       nrt = REC_NONE; /* record type for current node */
+       m0srcs = 0;     /* # source which will fit in current mbuf chain */
+       npbytes = 0;    /* # of bytes appended this packet */
+       nbytes = 0;     /* # of bytes appended to group's state-change queue */
+       rsrcs = 0;      /* # sources encoded in current record */
+       schanged = 0;   /* # nodes encoded in overall filter change */
+       nallow = 0;     /* # of source entries in ALLOW_NEW */
+       nblock = 0;     /* # of source entries in BLOCK_OLD */
+       nims = NULL;    /* next tree node pointer */

 
        /*
         * For each possible filter record mode.
 
        /*
         * For each possible filter record mode.


@@ -3171,23 +3237,24 @@ mld_v2_enqueue_filter_change(struct ifqueue *ifq, struct in6_multi *inm)
                        m0 = ifq->ifq_tail;
                        if (m0 != NULL &&
                            (m0->m_pkthdr.vt_nrecs + 1 <=
                        m0 = ifq->ifq_tail;
                        if (m0 != NULL &&
                            (m0->m_pkthdr.vt_nrecs + 1 <=

-                            MLD_V2_REPORT_MAXRECS) &&
+                           MLD_V2_REPORT_MAXRECS) &&

                            (m0->m_pkthdr.len + MINRECLEN) <
                            (m0->m_pkthdr.len + MINRECLEN) <

-                            (ifp->if_mtu - MLD_MTUSPACE)) {
+                           (ifp->if_mtu - MLD_MTUSPACE)) {

                                m = m0;
                                m0srcs = (ifp->if_mtu - m0->m_pkthdr.len -
                                m = m0;
                                m0srcs = (ifp->if_mtu - m0->m_pkthdr.len -

-                                           sizeof(struct mldv2_record)) /
-                                           sizeof(struct in6_addr);
+                                   sizeof(struct mldv2_record)) /
+                                   sizeof(struct in6_addr);

                                MLD_PRINTF(("%s: use previous packet\n",
                                    __func__));
                        } else {
                                m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
                                MLD_PRINTF(("%s: use previous packet\n",
                                    __func__));
                        } else {
                                m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);

-                               if (m == NULL)
+                               if (m == NULL) {

                                        m = m_gethdr(M_DONTWAIT, MT_DATA);
                                        m = m_gethdr(M_DONTWAIT, MT_DATA);

+                               }

                                if (m == NULL) {
                                        MLD_PRINTF(("%s: m_get*() failed\n",
                                            __func__));
                                if (m == NULL) {
                                        MLD_PRINTF(("%s: m_get*() failed\n",
                                            __func__));

-                                       return (-ENOMEM);
+                                       return -ENOMEM;

                                }
                                m->m_pkthdr.vt_nrecs = 0;
                                mld_save_context(m, ifp);
                                }
                                m->m_pkthdr.vt_nrecs = 0;
                                mld_save_context(m, ifp);


@@ -3209,11 +3276,12 @@ mld_v2_enqueue_filter_change(struct ifqueue *ifq, struct in6_multi *inm)
                        mr.mr_addr = inm->in6m_addr;
                        in6_clearscope(&mr.mr_addr);
                        if (!m_append(m, sizeof(mr), (void *)&mr)) {
                        mr.mr_addr = inm->in6m_addr;
                        in6_clearscope(&mr.mr_addr);
                        if (!m_append(m, sizeof(mr), (void *)&mr)) {

-                               if (m != m0)
+                               if (m != m0) {

                                        m_freem(m);
                                        m_freem(m);

+                               }

                                MLD_PRINTF(("%s: m_append() failed\n",
                                    __func__));
                                MLD_PRINTF(("%s: m_append() failed\n",
                                    __func__));

-                               return (-ENOMEM);
+                               return -ENOMEM;

                        }
                        npbytes += sizeof(struct mldv2_record);
                        if (m != m0) {
                        }
                        npbytes += sizeof(struct mldv2_record);
                        if (m != m0) {


@@ -3262,24 +3330,28 @@ mld_v2_enqueue_filter_change(struct ifqueue *ifq, struct in6_multi *inm)
                                        continue;
                                }
                                nrt = (rectype_t)now;
                                        continue;
                                }
                                nrt = (rectype_t)now;

-                               if (nrt == REC_NONE)
+                               if (nrt == REC_NONE) {

                                        nrt = (rectype_t)(~mode & REC_FULL);
                                        nrt = (rectype_t)(~mode & REC_FULL);

+                               }

                                if (schanged++ == 0) {
                                        crt = nrt;
                                if (schanged++ == 0) {
                                        crt = nrt;

-                               } else if (crt != nrt)
+                               } else if (crt != nrt) {

                                        continue;
                                        continue;

+                               }

                                if (!m_append(m, sizeof(struct in6_addr),
                                    (void *)&ims->im6s_addr)) {
                                if (!m_append(m, sizeof(struct in6_addr),
                                    (void *)&ims->im6s_addr)) {

-                                       if (m != m0)
+                                       if (m != m0) {

                                                m_freem(m);
                                                m_freem(m);

+                                       }

                                        MLD_PRINTF(("%s: m_append() failed\n",
                                            __func__));
                                        MLD_PRINTF(("%s: m_append() failed\n",
                                            __func__));

-                                       return (-ENOMEM);
+                                       return -ENOMEM;

                                }
                                nallow += !!(crt == REC_ALLOW);
                                nblock += !!(crt == REC_BLOCK);
                                }
                                nallow += !!(crt == REC_ALLOW);
                                nblock += !!(crt == REC_BLOCK);

-                               if (++rsrcs == m0srcs)
+                               if (++rsrcs == m0srcs) {

                                        break;
                                        break;

+                               }

                        }
                        /*
                         * If we did not append any tree nodes on this
                        }
                        /*
                         * If we did not append any tree nodes on this


@@ -3295,23 +3367,25 @@ mld_v2_enqueue_filter_change(struct ifqueue *ifq, struct in6_multi *inm)
                                        MLD_PRINTF(("%s: m_adj(m, -mr)\n",
                                            __func__));
                                        m_adj(m, -((int)sizeof(
                                        MLD_PRINTF(("%s: m_adj(m, -mr)\n",
                                            __func__));
                                        m_adj(m, -((int)sizeof(

-                                           struct mldv2_record)));
+                                                   struct mldv2_record)));

                                }
                                continue;
                        }
                        npbytes += (rsrcs * sizeof(struct in6_addr));
                                }
                                continue;
                        }
                        npbytes += (rsrcs * sizeof(struct in6_addr));

-                       if (crt == REC_ALLOW)
+                       if (crt == REC_ALLOW) {

                                pmr->mr_type = MLD_ALLOW_NEW_SOURCES;
                                pmr->mr_type = MLD_ALLOW_NEW_SOURCES;

-                       else if (crt == REC_BLOCK)
+                       } else if (crt == REC_BLOCK) {

                                pmr->mr_type = MLD_BLOCK_OLD_SOURCES;
                                pmr->mr_type = MLD_BLOCK_OLD_SOURCES;

+                       }

                        pmr->mr_numsrc = htons(rsrcs);
                        /*
                         * Count the new group record, and enqueue this
                         * packet if it wasn't already queued.
                         */
                        m->m_pkthdr.vt_nrecs++;
                        pmr->mr_numsrc = htons(rsrcs);
                        /*
                         * Count the new group record, and enqueue this
                         * packet if it wasn't already queued.
                         */
                        m->m_pkthdr.vt_nrecs++;

-                       if (m != m0)
+                       if (m != m0) {

                                IF_ENQUEUE(ifq, m);
                                IF_ENQUEUE(ifq, m);

+                       }

                        nbytes += npbytes;
                } while (nims != NULL);
                drt |= crt;
                        nbytes += npbytes;
                } while (nims != NULL);
                drt |= crt;


@@ -3321,19 +3395,19 @@ mld_v2_enqueue_filter_change(struct ifqueue *ifq, struct in6_multi *inm)
        MLD_PRINTF(("%s: queued %d ALLOW_NEW, %d BLOCK_OLD\n", __func__,
            nallow, nblock));
 
        MLD_PRINTF(("%s: queued %d ALLOW_NEW, %d BLOCK_OLD\n", __func__,
            nallow, nblock));
 

-       return (nbytes);
+       return nbytes;

 }
 
 static int
 mld_v2_merge_state_changes(struct in6_multi *inm, struct ifqueue *ifscq)
 {
 }
 
 static int
 mld_v2_merge_state_changes(struct in6_multi *inm, struct ifqueue *ifscq)
 {

-       struct ifqueue  *gq;
-       struct mbuf     *m;             /* pending state-change */
-       struct mbuf     *m0;            /* copy of pending state-change */
-       struct mbuf     *mt;            /* last state-change in packet */
-       struct mbuf     *n;
-       int              docopy, domerge;
-       u_int            recslen;
+       struct ifqueue  *gq;
+       struct mbuf     *m;             /* pending state-change */
+       struct mbuf     *m0;            /* copy of pending state-change */
+       struct mbuf     *mt;            /* last state-change in packet */
+       struct mbuf     *n;
+       int              docopy, domerge;
+       u_int            recslen;

 
        IN6M_LOCK_ASSERT_HELD(inm);
 
 
        IN6M_LOCK_ASSERT_HELD(inm);
 


@@ -3345,8 +3419,9 @@ mld_v2_merge_state_changes(struct in6_multi *inm, struct ifqueue *ifscq)
         * If there are further pending retransmissions, make a writable
         * copy of each queued state-change message before merging.
         */
         * If there are further pending retransmissions, make a writable
         * copy of each queued state-change message before merging.
         */

-       if (inm->in6m_scrv > 0)
+       if (inm->in6m_scrv > 0) {

                docopy = 1;
                docopy = 1;

+       }

 
        gq = &inm->in6m_scq;
 #ifdef MLD_DEBUG
 
        gq = &inm->in6m_scq;
 #ifdef MLD_DEBUG


@@ -3379,8 +3454,9 @@ mld_v2_merge_state_changes(struct in6_multi *inm, struct ifqueue *ifscq)
                            m->m_pkthdr.vt_nrecs <=
                            MLD_V2_REPORT_MAXRECS) &&
                            (mt->m_pkthdr.len + recslen <=
                            m->m_pkthdr.vt_nrecs <=
                            MLD_V2_REPORT_MAXRECS) &&
                            (mt->m_pkthdr.len + recslen <=

-                           (inm->in6m_ifp->if_mtu - MLD_MTUSPACE)))
+                           (inm->in6m_ifp->if_mtu - MLD_MTUSPACE))) {

                                domerge = 1;
                                domerge = 1;

+                       }

                }
 
                if (!domerge && IF_QFULL(gq)) {
                }
 
                if (!domerge && IF_QFULL(gq)) {


@@ -3407,8 +3483,9 @@ mld_v2_merge_state_changes(struct in6_multi *inm, struct ifqueue *ifscq)
                        MLD_PRINTF(("%s: copying 0x%llx\n", __func__,
                            (uint64_t)VM_KERNEL_ADDRPERM(m)));
                        m0 = m_dup(m, M_NOWAIT);
                        MLD_PRINTF(("%s: copying 0x%llx\n", __func__,
                            (uint64_t)VM_KERNEL_ADDRPERM(m)));
                        m0 = m_dup(m, M_NOWAIT);

-                       if (m0 == NULL)
-                               return (ENOMEM);
+                       if (m0 == NULL) {
+                               return ENOMEM;
+                       }

                        m0->m_nextpkt = NULL;
                        m = m->m_nextpkt;
                }
                        m0->m_nextpkt = NULL;
                        m = m->m_nextpkt;
                }


@@ -3419,7 +3496,7 @@ mld_v2_merge_state_changes(struct in6_multi *inm, struct ifqueue *ifscq)
                            (uint64_t)VM_KERNEL_ADDRPERM(ifscq)));
                        IF_ENQUEUE(ifscq, m0);
                } else {
                            (uint64_t)VM_KERNEL_ADDRPERM(ifscq)));
                        IF_ENQUEUE(ifscq, m0);
                } else {

-                       struct mbuf *mtl;       /* last mbuf of packet mt */
+                       struct mbuf *mtl;       /* last mbuf of packet mt */

 
                        MLD_PRINTF(("%s: merging 0x%llx with ifscq tail "
                            "0x%llx)\n", __func__,
 
                        MLD_PRINTF(("%s: merging 0x%llx with ifscq tail "
                            "0x%llx)\n", __func__,


@@ -3436,7 +3513,7 @@ mld_v2_merge_state_changes(struct in6_multi *inm, struct ifqueue *ifscq)
                }
        }
 
                }
        }
 

-       return (0);
+       return 0;

 }
 
 /*
 }
 
 /*


@@ -3445,10 +3522,10 @@ mld_v2_merge_state_changes(struct in6_multi *inm, struct ifqueue *ifscq)
 static uint32_t
 mld_v2_dispatch_general_query(struct mld_ifinfo *mli)
 {
 static uint32_t
 mld_v2_dispatch_general_query(struct mld_ifinfo *mli)
 {

-       struct ifnet            *ifp;
-       struct in6_multi        *inm;
-       struct in6_multistep    step;
-       int                      retval;
+       struct ifnet            *ifp;
+       struct in6_multi        *inm;
+       struct in6_multistep    step;
+       int                      retval;

 
        MLI_LOCK_ASSERT_HELD(mli);
 
 
        MLI_LOCK_ASSERT_HELD(mli);
 


@@ -3461,8 +3538,9 @@ mld_v2_dispatch_general_query(struct mld_ifinfo *mli)
        IN6_FIRST_MULTI(step, inm);
        while (inm != NULL) {
                IN6M_LOCK(inm);
        IN6_FIRST_MULTI(step, inm);
        while (inm != NULL) {
                IN6M_LOCK(inm);

-               if (inm->in6m_ifp != ifp)
+               if (inm->in6m_ifp != ifp) {

                        goto next;
                        goto next;

+               }

 
                switch (inm->in6m_state) {
                case MLD_NOT_MEMBER:
 
                switch (inm->in6m_state) {
                case MLD_NOT_MEMBER:


@@ -3501,10 +3579,10 @@ next:
         */
        if (mli->mli_gq.ifq_head != NULL) {
                mli->mli_v2_timer = 1 + MLD_RANDOM_DELAY(
         */
        if (mli->mli_gq.ifq_head != NULL) {
                mli->mli_v2_timer = 1 + MLD_RANDOM_DELAY(

-                   MLD_RESPONSE_BURST_INTERVAL);
+                       MLD_RESPONSE_BURST_INTERVAL);

        }
 
        }
 

-       return (mli->mli_v2_timer);
+       return mli->mli_v2_timer;

 }
 
 /*
 }
 
 /*


@@ -3515,16 +3593,16 @@ next:
 static void
 mld_dispatch_packet(struct mbuf *m)
 {
 static void
 mld_dispatch_packet(struct mbuf *m)
 {

-       struct ip6_moptions     *im6o;
-       struct ifnet            *ifp;
-       struct ifnet            *oifp = NULL;
-       struct mbuf             *m0;
-       struct mbuf             *md;
-       struct ip6_hdr          *ip6;
-       struct mld_hdr          *mld;
-       int                      error;
-       int                      off;
-       int                      type;
+       struct ip6_moptions     *im6o;
+       struct ifnet            *ifp;
+       struct ifnet            *oifp = NULL;
+       struct mbuf             *m0;
+       struct mbuf             *md;
+       struct ip6_hdr          *ip6;
+       struct mld_hdr          *mld;
+       int                      error;
+       int                      off;
+       int                      type;

 
        MLD_PRINTF(("%s: transmit 0x%llx\n", __func__,
            (uint64_t)VM_KERNEL_ADDRPERM(m)));
 
        MLD_PRINTF(("%s: transmit 0x%llx\n", __func__,
            (uint64_t)VM_KERNEL_ADDRPERM(m)));


@@ -3584,8 +3662,8 @@ mld_dispatch_packet(struct mbuf *m)
        type = mld->mld_type;
 
        if (ifp->if_eflags & IFEF_TXSTART) {
        type = mld->mld_type;
 
        if (ifp->if_eflags & IFEF_TXSTART) {

-               /* 
-                * Use control service class if the outgoing 
+               /*
+                * Use control service class if the outgoing

                 * interface supports transmit-start model.
                 */
                (void) m_set_service_class(m0, MBUF_SC_CTL);
                 * interface supports transmit-start model.
                 */
                (void) m_set_service_class(m0, MBUF_SC_CTL);


@@ -3599,8 +3677,9 @@ mld_dispatch_packet(struct mbuf *m)
        if (error) {
                MLD_PRINTF(("%s: ip6_output(0x%llx) = %d\n", __func__,
                    (uint64_t)VM_KERNEL_ADDRPERM(m0), error));
        if (error) {
                MLD_PRINTF(("%s: ip6_output(0x%llx) = %d\n", __func__,
                    (uint64_t)VM_KERNEL_ADDRPERM(m0), error));

-               if (oifp != NULL)
+               if (oifp != NULL) {

                        ifnet_release(oifp);
                        ifnet_release(oifp);

+               }

                return;
        }
 
                return;
        }
 


@@ -3632,27 +3711,29 @@ mld_dispatch_packet(struct mbuf *m)
 static struct mbuf *
 mld_v2_encap_report(struct ifnet *ifp, struct mbuf *m)
 {
 static struct mbuf *
 mld_v2_encap_report(struct ifnet *ifp, struct mbuf *m)
 {

-       struct mbuf             *mh;
-       struct mldv2_report     *mld;
-       struct ip6_hdr          *ip6;
-       struct in6_ifaddr       *ia;
-       int                      mldreclen;
+       struct mbuf             *mh;
+       struct mldv2_report     *mld;
+       struct ip6_hdr          *ip6;
+       struct in6_ifaddr       *ia;
+       int                      mldreclen;

 
        VERIFY(m->m_flags & M_PKTHDR);
 
        /*
         * RFC3590: OK to send as :: or tentative during DAD.
         */
 
        VERIFY(m->m_flags & M_PKTHDR);
 
        /*
         * RFC3590: OK to send as :: or tentative during DAD.
         */

-       ia = in6ifa_ifpforlinklocal(ifp, IN6_IFF_NOTREADY|IN6_IFF_ANYCAST);
-       if (ia == NULL)
+       ia = in6ifa_ifpforlinklocal(ifp, IN6_IFF_NOTREADY | IN6_IFF_ANYCAST);
+       if (ia == NULL) {

                MLD_PRINTF(("%s: warning: ia is NULL\n", __func__));
                MLD_PRINTF(("%s: warning: ia is NULL\n", __func__));

+       }

 
        MGETHDR(mh, M_DONTWAIT, MT_HEADER);
        if (mh == NULL) {
 
        MGETHDR(mh, M_DONTWAIT, MT_HEADER);
        if (mh == NULL) {

-               if (ia != NULL)
+               if (ia != NULL) {

                        IFA_REMREF(&ia->ia_ifa);
                        IFA_REMREF(&ia->ia_ifa);

+               }

                m_freem(m);
                m_freem(m);

-               return (NULL);
+               return NULL;

        }
        MH_ALIGN(mh, sizeof(struct ip6_hdr) + sizeof(struct mldv2_report));
 
        }
        MH_ALIGN(mh, sizeof(struct ip6_hdr) + sizeof(struct mldv2_report));
 


@@ -3668,8 +3749,9 @@ mld_v2_encap_report(struct ifnet *ifp, struct mbuf *m)
        ip6->ip6_vfc &= ~IPV6_VERSION_MASK;
        ip6->ip6_vfc |= IPV6_VERSION;
        ip6->ip6_nxt = IPPROTO_ICMPV6;
        ip6->ip6_vfc &= ~IPV6_VERSION_MASK;
        ip6->ip6_vfc |= IPV6_VERSION;
        ip6->ip6_nxt = IPPROTO_ICMPV6;

-       if (ia != NULL)
+       if (ia != NULL) {

                IFA_LOCK(&ia->ia_ifa);
                IFA_LOCK(&ia->ia_ifa);

+       }

        ip6->ip6_src = ia ? ia->ia_addr.sin6_addr : in6addr_any;
        if (ia != NULL) {
                IFA_UNLOCK(&ia->ia_ifa);
        ip6->ip6_src = ia ? ia->ia_addr.sin6_addr : in6addr_any;
        if (ia != NULL) {
                IFA_UNLOCK(&ia->ia_ifa);


@@ -3691,7 +3773,7 @@ mld_v2_encap_report(struct ifnet *ifp, struct mbuf *m)
        mh->m_next = m;
        mld->mld_cksum = in6_cksum(mh, IPPROTO_ICMPV6,
            sizeof(struct ip6_hdr), sizeof(struct mldv2_report) + mldreclen);
        mh->m_next = m;
        mld->mld_cksum = in6_cksum(mh, IPPROTO_ICMPV6,
            sizeof(struct ip6_hdr), sizeof(struct mldv2_report) + mldreclen);

-       return (mh);
+       return mh;

 }
 
 #ifdef MLD_DEBUG
 }
 
 #ifdef MLD_DEBUG


@@ -3699,20 +3781,20 @@ static const char *
 mld_rec_type_to_str(const int type)
 {
        switch (type) {
 mld_rec_type_to_str(const int type)
 {
        switch (type) {

-               case MLD_CHANGE_TO_EXCLUDE_MODE:
-                       return "TO_EX";
-               case MLD_CHANGE_TO_INCLUDE_MODE:
-                       return "TO_IN";
-               case MLD_MODE_IS_EXCLUDE:
-                       return "MODE_EX";
-               case MLD_MODE_IS_INCLUDE:
-                       return "MODE_IN";
-               case MLD_ALLOW_NEW_SOURCES:
-                       return "ALLOW_NEW";
-               case MLD_BLOCK_OLD_SOURCES:
-                       return "BLOCK_OLD";
-               default:
-                       break;
+       case MLD_CHANGE_TO_EXCLUDE_MODE:
+               return "TO_EX";
+       case MLD_CHANGE_TO_INCLUDE_MODE:
+               return "TO_IN";
+       case MLD_MODE_IS_EXCLUDE:
+               return "MODE_EX";
+       case MLD_MODE_IS_INCLUDE:
+               return "MODE_IN";
+       case MLD_ALLOW_NEW_SOURCES:
+               return "ALLOW_NEW";
+       case MLD_BLOCK_OLD_SOURCES:
+               return "BLOCK_OLD";
+       default:
+               break;

        }
        return "unknown";
 }
        }
        return "unknown";
 }


@@ -3721,14 +3803,13 @@ mld_rec_type_to_str(const int type)
 void
 mld_init(void)
 {
 void
 mld_init(void)
 {

-

        MLD_PRINTF(("%s: initializing\n", __func__));
 
        MLD_PRINTF(("%s: initializing\n", __func__));
 

-        /* Setup lock group and attribute for mld_mtx */
-        mld_mtx_grp_attr = lck_grp_attr_alloc_init();
-        mld_mtx_grp = lck_grp_alloc_init("mld_mtx\n", mld_mtx_grp_attr);
-        mld_mtx_attr = lck_attr_alloc_init();
-        lck_mtx_init(&mld_mtx, mld_mtx_grp, mld_mtx_attr);
+       /* Setup lock group and attribute for mld_mtx */
+       mld_mtx_grp_attr = lck_grp_attr_alloc_init();
+       mld_mtx_grp = lck_grp_alloc_init("mld_mtx\n", mld_mtx_grp_attr);
+       mld_mtx_attr = lck_attr_alloc_init();
+       lck_mtx_init(&mld_mtx, mld_mtx_grp, mld_mtx_attr);

 
        ip6_initpktopts(&mld_po);
        mld_po.ip6po_hlim = 1;
 
        ip6_initpktopts(&mld_po);
        mld_po.ip6po_hlim = 1;


@@ -3737,7 +3818,7 @@ mld_init(void)
        mld_po.ip6po_flags = IP6PO_DONTFRAG;
        LIST_INIT(&mli_head);
 
        mld_po.ip6po_flags = IP6PO_DONTFRAG;
        LIST_INIT(&mli_head);
 

-       mli_size = sizeof (struct mld_ifinfo);
+       mli_size = sizeof(struct mld_ifinfo);

        mli_zone = zinit(mli_size, MLI_ZONE_MAX * mli_size,
            0, MLI_ZONE_NAME);
        if (mli_zone == NULL) {
        mli_zone = zinit(mli_size, MLI_ZONE_MAX * mli_size,
            0, MLI_ZONE_NAME);
        if (mli_zone == NULL) {