 @@ -1,912 +1,912 @@
-/*	$NetBSD: if_llatbl.c,v 1.18.6.3 2018/03/13 13:27:10 martin Exp $	*/
+/*	$NetBSD: if_llatbl.c,v 1.18.6.4 2018/06/09 14:44:33 martin Exp $	*/
 /*
  * Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
  * Copyright (c) 2004-2008 Qing Li. All rights reserved.
  * Copyright (c) 2008 Kip Macy. All rights reserved.
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include "arp.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/rwlock.h>
 #ifdef DDB
 #include <ddb/ddb.h>
 #endif
 #include <netinet/in.h>
 #include <net/if_llatbl.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/route.h>
 #include <netinet/if_inarp.h>
 #include <netinet/in_var.h>
 #include <netinet6/in6_var.h>
 #include <netinet6/nd6.h>
 static SLIST_HEAD(, lltable) lltables;
 krwlock_t lltable_rwlock;
 static struct pool llentry_pool;
 static void lltable_unlink(struct lltable *llt);
 static void llentries_unlink(struct lltable *llt, struct llentries *head);
 static void htable_unlink_entry(struct llentry *lle);
 static void htable_link_entry(struct lltable *llt, struct llentry *lle);
 static int htable_foreach_lle(struct lltable *llt, llt_foreach_cb_t *f,
     void *farg);
 int
 lltable_dump_entry(struct lltable *llt, struct llentry *lle,
     struct rt_walkarg *w, struct sockaddr *sa)
+{
 #define RTF_LLINFO	0x400
 #define RTF_CLONED	0x2000
 	struct ifnet *ifp = llt->llt_ifp;
 	int error;
 	void *a;
 	struct sockaddr_dl sdl;
 	int size;
 	struct rt_addrinfo info;
 	memset(&info, 0, sizeof(info));
 	info.rti_info[RTAX_DST] = sa;
 	a = (lle->la_flags & LLE_VALID) == LLE_VALID ? &lle->ll_addr : NULL;
 	if (sockaddr_dl_init(&sdl, sizeof(sdl), ifp->if_index, ifp->if_type,
 	    NULL, 0, a, ifp->if_addrlen) == NULL)
 		return EINVAL;
 	info.rti_info[RTAX_GATEWAY] = sstocsa(&sdl);
 	if (sa->sa_family == AF_INET && lle->la_flags & LLE_PUB) {
 		struct sockaddr_inarp *sin;
 		sin = (struct sockaddr_inarp *)sa;
 		sin->sin_other = SIN_PROXY;
+	}
 	if ((error = rt_msg3(RTM_GET, &info, 0, w, &size)))
 		return error;
 	if (w->w_where && w->w_tmem && w->w_needed <= 0) {
 		struct rt_msghdr *rtm = (struct rt_msghdr *)w->w_tmem;
 		/* Need to copy by myself */
 		rtm->rtm_index = ifp->if_index;
 		rtm->rtm_rmx.rmx_mtu = 0;
-		rtm->rtm_rmx.rmx_expire =
+		rtm->rtm_rmx.rmx_expire = (lle->la_flags & LLE_STATIC) ? 0 :
-		    (lle->la_flags & LLE_STATIC) ? 0 : lle->la_expire;
+		    time_mono_to_wall(lle->la_expire);
 		rtm->rtm_flags = RTF_UP;
 		rtm->rtm_flags |= RTF_HOST; /* For ndp */
 		/* For backward compatibility */
 		rtm->rtm_flags |= RTF_LLINFO | RTF_CLONED;
 		rtm->rtm_flags |= (lle->la_flags & LLE_STATIC) ? RTF_STATIC : 0;
 		if (lle->la_flags & LLE_PUB)
 			rtm->rtm_flags |= RTF_ANNOUNCE;
 		rtm->rtm_addrs = info.rti_addrs;
 		if ((error = copyout(rtm, w->w_where, size)) != 0)
 			w->w_where = NULL;
 		else
 			w->w_where = (char *)w->w_where + size;
+	}
 	return error;
 #undef RTF_LLINFO
 #undef RTF_CLONED
+}
 /*
  * Dump lle state for a specific address family.
  */
 static int
 lltable_dump_af(struct lltable *llt, struct rt_walkarg *w)
+{
 	int error;
 	LLTABLE_LOCK_ASSERT();
 	if (llt->llt_ifp->if_flags & IFF_LOOPBACK)
 		return (0);
 	error = 0;
 	IF_AFDATA_RLOCK(llt->llt_ifp);
 	error = lltable_foreach_lle(llt,
 	    (llt_foreach_cb_t *)llt->llt_dump_entry, w);
 	IF_AFDATA_RUNLOCK(llt->llt_ifp);
 	return (error);
+}
 /*
  * Dump arp state for a specific address family.
  */
 int
 lltable_sysctl_dump(int af, struct rt_walkarg *w)
+{
 	struct lltable *llt;
 	int error = 0;
 	LLTABLE_RLOCK();
 	SLIST_FOREACH(llt, &lltables, llt_link) {
 		if (llt->llt_af == af) {
 			error = lltable_dump_af(llt, w);
 			if (error != 0)
 				goto done;
+		}
+	}
 done:
 	LLTABLE_RUNLOCK();
 	return (error);
+}
 /*
  * Common function helpers for chained hash table.
  */
 /*
  * Runs specified callback for each entry in @llt.
  * Caller does the locking.
+ *
  */
 static int
 htable_foreach_lle(struct lltable *llt, llt_foreach_cb_t *f, void *farg)
+{
 	struct llentry *lle, *next;
 	int i, error;
 	error = 0;
 	for (i = 0; i < llt->llt_hsize; i++) {
 		LIST_FOREACH_SAFE(lle, &llt->lle_head[i], lle_next, next) {
 			error = f(llt, lle, farg);
 			if (error != 0)
 				break;
+		}
+	}
 	return (error);
+}
 static void
 htable_link_entry(struct lltable *llt, struct llentry *lle)
+{
 	struct llentries *lleh;
 	uint32_t hashidx;
 	if ((lle->la_flags & LLE_LINKED) != 0)
 		return;
 	IF_AFDATA_WLOCK_ASSERT(llt->llt_ifp);
 	hashidx = llt->llt_hash(lle, llt->llt_hsize);
 	lleh = &llt->lle_head[hashidx];
 	lle->lle_tbl  = llt;
 	lle->lle_head = lleh;
 	lle->la_flags |= LLE_LINKED;
 	LIST_INSERT_HEAD(lleh, lle, lle_next);
 	llt->llt_lle_count++;
+}
 static void
 htable_unlink_entry(struct llentry *lle)
+{
 	if ((lle->la_flags & LLE_LINKED) != 0) {
 		IF_AFDATA_WLOCK_ASSERT(lle->lle_tbl->llt_ifp);
 		LIST_REMOVE(lle, lle_next);
 		lle->la_flags &= ~(LLE_VALID | LLE_LINKED);
 #if 0
 		lle->lle_tbl = NULL;
 		lle->lle_head = NULL;
 #endif
 		KASSERT(lle->lle_tbl->llt_lle_count != 0);
 		lle->lle_tbl->llt_lle_count--;
+	}
+}
 struct prefix_match_data {
 	const struct sockaddr *prefix;
 	const struct sockaddr *mask;
 	struct llentries dchain;
 	u_int flags;
 };
 static int
 htable_prefix_free_cb(struct lltable *llt, struct llentry *lle, void *farg)
+{
 	struct prefix_match_data *pmd;
 	pmd = (struct prefix_match_data *)farg;
 	if (llt->llt_match_prefix(pmd->prefix, pmd->mask, pmd->flags, lle)) {
 		LLE_WLOCK(lle);
 		LIST_INSERT_HEAD(&pmd->dchain, lle, lle_chain);
+	}
 	return (0);
+}
 static void
 htable_prefix_free(struct lltable *llt, const struct sockaddr *prefix,
     const struct sockaddr *mask, u_int flags)
+{
 	struct llentry *lle, *next;
 	struct prefix_match_data pmd;
 	memset(&pmd, 0, sizeof(pmd));
 	pmd.prefix = prefix;
 	pmd.mask = mask;
 	pmd.flags = flags;
 	LIST_INIT(&pmd.dchain);
 	IF_AFDATA_WLOCK(llt->llt_ifp);
 	/* Push matching lles to chain */
 	lltable_foreach_lle(llt, htable_prefix_free_cb, &pmd);
 	llentries_unlink(llt, &pmd.dchain);
 	IF_AFDATA_WUNLOCK(llt->llt_ifp);
 	LIST_FOREACH_SAFE(lle, &pmd.dchain, lle_chain, next)
 		llt->llt_free_entry(llt, lle);
+}
 static void
 htable_free_tbl(struct lltable *llt)
+{
 	free(llt->lle_head, M_LLTABLE);
 	free(llt, M_LLTABLE);
+}
 static void
 llentries_unlink(struct lltable *llt, struct llentries *head)
+{
 	struct llentry *lle, *next;
 	LIST_FOREACH_SAFE(lle, head, lle_chain, next)
 		llt->llt_unlink_entry(lle);
+}
 /*
  * Helper function used to drop all mbufs in hold queue.
+ *
  * Returns the number of held packets, if any, that were dropped.
  */
 size_t
 lltable_drop_entry_queue(struct llentry *lle)
+{
 	size_t pkts_dropped;
 	struct mbuf *next;
 	LLE_WLOCK_ASSERT(lle);
 	pkts_dropped = 0;
 	while ((lle->la_numheld > 0) && (lle->la_hold != NULL)) {
 		next = lle->la_hold->m_nextpkt;
 		m_freem(lle->la_hold);
 		lle->la_hold = next;
 		lle->la_numheld--;
 		pkts_dropped++;
+	}
 	KASSERTMSG(lle->la_numheld == 0,
 		"la_numheld %d > 0, pkts_droped %zd",
 		 lle->la_numheld, pkts_dropped);
 	return (pkts_dropped);
+}
 struct llentry *
 llentry_pool_get(int flags)
+{
 	struct llentry *lle;
 	lle = pool_get(&llentry_pool, flags);
 	if (lle != NULL)
 		memset(lle, 0, sizeof(*lle));
 	return lle;
+}
 void
 llentry_pool_put(struct llentry *lle)
+{
 	pool_put(&llentry_pool, lle);
+}
 /*
  * Deletes an address from the address table.
  * This function is called by the timer functions
  * such as arptimer() and nd6_llinfo_timer(), and
  * the caller does the locking.
+ *
  * Returns the number of held packets, if any, that were dropped.
  */
 size_t
 llentry_free(struct llentry *lle)
+{
 	struct lltable *llt;
 	size_t pkts_dropped;
 	LLE_WLOCK_ASSERT(lle);
 	lle->la_flags |= LLE_DELETED;
 	if ((lle->la_flags & LLE_LINKED) != 0) {
 		llt = lle->lle_tbl;
 		IF_AFDATA_WLOCK_ASSERT(llt->llt_ifp);
 		llt->llt_unlink_entry(lle);
+	}
 	/*
 	 * Stop a pending callout if one exists.  If we cancel one, we have to
 	 * remove a reference to avoid a leak.  callout_pending is required to
 	 * to exclude the case that the callout has never been scheduled.
 	 */
 	/* XXX once softnet_lock goes away, we should use callout_halt */
 	if (callout_pending(&lle->la_timer)) {
 		bool expired = callout_stop(&lle->la_timer);
 		if (!expired)
 			LLE_REMREF(lle);
+	}
 	pkts_dropped = lltable_drop_entry_queue(lle);
 	LLE_FREE_LOCKED(lle);
 	return (pkts_dropped);
+}
 /*
  * (al)locate an llentry for address dst (equivalent to rtalloc for new-arp).
+ *
  * If found the llentry * is returned referenced and unlocked.
  */
 struct llentry *
 llentry_alloc(struct ifnet *ifp, struct lltable *lt,
     struct sockaddr_storage *dst)
+{
 	struct llentry *la;
 	IF_AFDATA_RLOCK(ifp);
 	la = lla_lookup(lt, LLE_EXCLUSIVE, (struct sockaddr *)dst);
 	IF_AFDATA_RUNLOCK(ifp);
 	if ((la == NULL) &&
 #ifdef __FreeBSD__
 	    (ifp->if_flags & (IFF_NOARP | IFF_STATICARP)) == 0) {
 #else /* XXX */
 	    (ifp->if_flags & IFF_NOARP) == 0) {
 #endif
 		IF_AFDATA_WLOCK(ifp);
 		la = lla_create(lt, 0, (struct sockaddr *)dst, NULL /* XXX */);
 		IF_AFDATA_WUNLOCK(ifp);
+	}
 	if (la != NULL) {
 		LLE_ADDREF(la);
 		LLE_WUNLOCK(la);
+	}
 	return (la);
+}
 /*
  * Free all entries from given table and free itself.
  */
 static int
 lltable_free_cb(struct lltable *llt, struct llentry *lle, void *farg)
+{
 	struct llentries *dchain;
 	dchain = (struct llentries *)farg;
 	LLE_WLOCK(lle);
 	LIST_INSERT_HEAD(dchain, lle, lle_chain);
 	return (0);
+}
 /*
  * Free all entries from given table.
  */
 void
 lltable_purge_entries(struct lltable *llt)
+{
 	struct llentry *lle, *next;
 	struct llentries dchain;
 	KASSERTMSG(llt != NULL, "llt is NULL");
 	LIST_INIT(&dchain);
 	IF_AFDATA_WLOCK(llt->llt_ifp);
 	/* Push all lles to @dchain */
 	lltable_foreach_lle(llt, lltable_free_cb, &dchain);
 	llentries_unlink(llt, &dchain);
 	IF_AFDATA_WUNLOCK(llt->llt_ifp);
 	LIST_FOREACH_SAFE(lle, &dchain, lle_chain, next)
 		(void)llentry_free(lle);
+}
 /*
  * Free all entries from given table and free itself.
  */
 void
 lltable_free(struct lltable *llt)
+{
 	KASSERTMSG(llt != NULL, "llt is NULL");
 	lltable_unlink(llt);
 	lltable_purge_entries(llt);
 	llt->llt_free_tbl(llt);
+}
 void
 lltable_drain(int af)
+{
 	struct lltable	*llt;
 	struct llentry	*lle;
 	register int i;
 	LLTABLE_RLOCK();
 	SLIST_FOREACH(llt, &lltables, llt_link) {
 		if (llt->llt_af != af)
 			continue;
 		for (i=0; i < llt->llt_hsize; i++) {
 			LIST_FOREACH(lle, &llt->lle_head[i], lle_next) {
 				LLE_WLOCK(lle);
 				lltable_drop_entry_queue(lle);
 				LLE_WUNLOCK(lle);
+			}
+		}
+	}
 	LLTABLE_RUNLOCK();
+}
 void
 lltable_prefix_free(const int af, const struct sockaddr *prefix,
     const struct sockaddr *mask, const u_int flags)
+{
 	struct lltable *llt;
 	LLTABLE_RLOCK();
 	SLIST_FOREACH(llt, &lltables, llt_link) {
 		if (llt->llt_af != af)
 			continue;
 		llt->llt_prefix_free(llt, prefix, mask, flags);
+	}
 	LLTABLE_RUNLOCK();
+}
 struct lltable *
 lltable_allocate_htbl(uint32_t hsize)
+{
 	struct lltable *llt;
 	int i;
 	llt = malloc(sizeof(struct lltable), M_LLTABLE, M_WAITOK | M_ZERO);
 	llt->llt_hsize = hsize;
 	llt->lle_head = malloc(sizeof(struct llentries) * hsize,
 	    M_LLTABLE, M_WAITOK | M_ZERO);
 	for (i = 0; i < llt->llt_hsize; i++)
 		LIST_INIT(&llt->lle_head[i]);
 	/* Set some default callbacks */
 	llt->llt_link_entry = htable_link_entry;
 	llt->llt_unlink_entry = htable_unlink_entry;
 	llt->llt_prefix_free = htable_prefix_free;
 	llt->llt_foreach_entry = htable_foreach_lle;
 	llt->llt_free_tbl = htable_free_tbl;
 	return (llt);
+}
 /*
  * Links lltable to global llt list.
  */
 void
 lltable_link(struct lltable *llt)
+{
 	LLTABLE_WLOCK();
 	SLIST_INSERT_HEAD(&lltables, llt, llt_link);
 	LLTABLE_WUNLOCK();
+}
 static void
 lltable_unlink(struct lltable *llt)
+{
 	LLTABLE_WLOCK();
 	SLIST_REMOVE(&lltables, llt, lltable, llt_link);
 	LLTABLE_WUNLOCK();
+}
 /*
  * External methods used by lltable consumers
  */
 int
 lltable_foreach_lle(struct lltable *llt, llt_foreach_cb_t *f, void *farg)
+{
 	return (llt->llt_foreach_entry(llt, f, farg));
+}
 void
 lltable_link_entry(struct lltable *llt, struct llentry *lle)
+{
 	llt->llt_link_entry(llt, lle);
+}
 void
 lltable_unlink_entry(struct lltable *llt, struct llentry *lle)
+{
 	llt->llt_unlink_entry(lle);
+}
 void
 lltable_free_entry(struct lltable *llt, struct llentry *lle)
+{
 	llt->llt_free_entry(llt, lle);
+}
 void
 lltable_fill_sa_entry(const struct llentry *lle, struct sockaddr *sa)
+{
 	struct lltable *llt;
 	llt = lle->lle_tbl;
 	llt->llt_fill_sa_entry(lle, sa);
+}
 struct ifnet *
 lltable_get_ifp(const struct lltable *llt)
+{
 	return (llt->llt_ifp);
+}
 int
 lltable_get_af(const struct lltable *llt)
+{
 	return (llt->llt_af);
+}
 /*
  * Called in route_output when rtm_flags contains RTF_LLDATA.
  */
 int
 lla_rt_output(const u_char rtm_type, const int rtm_flags, const time_t rtm_expire,
     struct rt_addrinfo *info, int sdl_index)
+{
 	const struct sockaddr_dl *dl = satocsdl(info->rti_info[RTAX_GATEWAY]);
 	const struct sockaddr *dst = info->rti_info[RTAX_DST];
 	struct ifnet *ifp;
 	struct lltable *llt;
 	struct llentry *lle;
 	u_int laflags;
 	int error;
 	struct psref psref;
 	int bound;
 	KASSERTMSG(dl != NULL && dl->sdl_family == AF_LINK, "invalid dl");
 	bound = curlwp_bind();
 	if (sdl_index != 0)
 		ifp = if_get_byindex(sdl_index, &psref);
 	else
 		ifp = if_get_byindex(dl->sdl_index, &psref);
 	if (ifp == NULL) {
 		curlwp_bindx(bound);
 		log(LOG_INFO, "%s: invalid ifp (sdl_index %d)\n",
 		    __func__, sdl_index != 0 ? sdl_index : dl->sdl_index);
 		return EINVAL;
+	}
 	/* XXX linked list may be too expensive */
 	LLTABLE_RLOCK();
 	SLIST_FOREACH(llt, &lltables, llt_link) {
 		if (llt->llt_af == dst->sa_family &&
 		    llt->llt_ifp == ifp)
 			break;
+	}
 	LLTABLE_RUNLOCK();
 	KASSERTMSG(llt != NULL, "Yep, ugly hacks are bad");
 	error = 0;
 	switch (rtm_type) {
 	case RTM_ADD: {
 		struct rtentry *rt;
 		/* Never call rtalloc1 with IF_AFDATA_WLOCK */
 		rt = rtalloc1(dst, 0);
 		/* Add static LLE */
 		IF_AFDATA_WLOCK(ifp);
 		lle = lla_lookup(llt, 0, dst);
 		/* Cannot overwrite an existing static entry */
 		if (lle != NULL &&
 		    (lle->la_flags & LLE_STATIC || lle->la_expire == 0)) {
 			LLE_RUNLOCK(lle);
 			IF_AFDATA_WUNLOCK(ifp);
 			if (rt != NULL)
 				rt_unref(rt);
 			error = EEXIST;
 			goto out;
+		}
 		if (lle != NULL)
 			LLE_RUNLOCK(lle);
 		lle = lla_create(llt, 0, dst, rt);
 		if (lle == NULL) {
 			IF_AFDATA_WUNLOCK(ifp);
 			if (rt != NULL)
 				rt_unref(rt);
 			error = ENOMEM;
 			goto out;
+		}
 		KASSERT(ifp->if_addrlen <= sizeof(lle->ll_addr));
 		memcpy(&lle->ll_addr, CLLADDR(dl), ifp->if_addrlen);
 		if ((rtm_flags & RTF_ANNOUNCE))
 			lle->la_flags |= LLE_PUB;
 		lle->la_flags |= LLE_VALID;
 #ifdef INET6
 		/*
 		 * ND6
 		 */
 		if (dst->sa_family == AF_INET6)
 			lle->ln_state = ND6_LLINFO_REACHABLE;
 #endif
 		/*
 		 * NB: arp and ndp always set (RTF_STATIC | RTF_HOST)
 		 */
 		if (rtm_expire == 0) {
 			lle->la_flags |= LLE_STATIC;
 			lle->la_expire = 0;
 		} else
 			lle->la_expire = rtm_expire;
 		laflags = lle->la_flags;
 		LLE_WUNLOCK(lle);
 		IF_AFDATA_WUNLOCK(ifp);
 		if (rt != NULL)
 			rt_unref(rt);
 #if defined(INET) && NARP > 0
 		/* gratuitous ARP */
 		if ((laflags & LLE_PUB) && dst->sa_family == AF_INET) {
 			const struct sockaddr_in *sin;
 			struct in_ifaddr *ia;
 			struct psref _psref;
 			sin = satocsin(dst);
 			ia = in_get_ia_on_iface_psref(sin->sin_addr,
 			    ifp, &_psref);
 			if (ia != NULL) {
 				arpannounce(ifp, &ia->ia_ifa, CLLADDR(dl));
 				ia4_release(ia, &_psref);
+			}
+		}
 #else
 		(void)laflags;
 #endif
 		break;
+	    }
 	case RTM_DELETE:
 		IF_AFDATA_WLOCK(ifp);
 		error = lla_delete(llt, 0, dst);
 		IF_AFDATA_WUNLOCK(ifp);
 		error = (error == 0 ? 0 : ENOENT);
 		break;
 	default:
 		error = EINVAL;
+	}
 out:
 	if_put(ifp, &psref);
 	curlwp_bindx(bound);
 	return (error);
+}
 void
 lltableinit(void)
+{
 	SLIST_INIT(&lltables);
 	rw_init(&lltable_rwlock);
 	pool_init(&llentry_pool, sizeof(struct llentry), 0, 0, 0, "llentrypl",
 	    NULL, IPL_SOFTNET);
+}
 #ifdef __FreeBSD__
 #ifdef DDB
 struct llentry_sa {
 	struct llentry		base;
 	struct sockaddr		l3_addr;
 };
 static void
 llatbl_lle_show(struct llentry_sa *la)
+{
 	struct llentry *lle;
 	uint8_t octet[6];
 	lle = &la->base;
 	db_printf("lle=%p\n", lle);
 	db_printf(" lle_next=%p\n", lle->lle_next.le_next);
 	db_printf(" lle_lock=%p\n", &lle->lle_lock);
 	db_printf(" lle_tbl=%p\n", lle->lle_tbl);
 	db_printf(" lle_head=%p\n", lle->lle_head);
 	db_printf(" la_hold=%p\n", lle->la_hold);
 	db_printf(" la_numheld=%d\n", lle->la_numheld);
 	db_printf(" la_expire=%ju\n", (uintmax_t)lle->la_expire);
 	db_printf(" la_flags=0x%04x\n", lle->la_flags);
 	db_printf(" la_asked=%u\n", lle->la_asked);
 	db_printf(" la_preempt=%u\n", lle->la_preempt);
 	db_printf(" ln_byhint=%u\n", lle->ln_byhint);
 	db_printf(" ln_state=%d\n", lle->ln_state);
 	db_printf(" ln_router=%u\n", lle->ln_router);
 	db_printf(" ln_ntick=%ju\n", (uintmax_t)lle->ln_ntick);
 	db_printf(" lle_refcnt=%d\n", lle->lle_refcnt);
 	memcopy(octet, &lle->ll_addr.mac16, sizeof(octet));
 	db_printf(" ll_addr=%02x:%02x:%02x:%02x:%02x:%02x\n",
 	    octet[0], octet[1], octet[2], octet[3], octet[4], octet[5]);
 	db_printf(" lle_timer=%p\n", &lle->lle_timer);
 	switch (la->l3_addr.sa_family) {
 #ifdef INET
 	case AF_INET:
+	{
 		struct sockaddr_in *sin;
 		char l3s[INET_ADDRSTRLEN];
 		sin = (struct sockaddr_in *)&la->l3_addr;
 		inet_ntoa_r(sin->sin_addr, l3s);
 		db_printf(" l3_addr=%s\n", l3s);
 		break;
+	}
 #endif
 #ifdef INET6
 	case AF_INET6:
+	{
 		struct sockaddr_in6 *sin6;
 		char l3s[INET6_ADDRSTRLEN];
 		sin6 = (struct sockaddr_in6 *)&la->l3_addr;
 		IN6_PRINT(l3s, &sin6->sin6_addr);
 		db_printf(" l3_addr=%s\n", l3s);
 		break;
+	}
 #endif
 	default:
 		db_printf(" l3_addr=N/A (af=%d)\n", la->l3_addr.sa_family);
 		break;
+	}
+}
 DB_SHOW_COMMAND(llentry, db_show_llentry)
+{
 	if (!have_addr) {
 		db_printf("usage: show llentry <struct llentry *>\n");
 		return;
+	}
 	llatbl_lle_show((struct llentry_sa *)addr);
+}
 static void
 llatbl_llt_show(struct lltable *llt)
+{
 	int i;
 	struct llentry *lle;
 	db_printf("llt=%p llt_af=%d llt_ifp=%p\n",
 	    llt, llt->llt_af, llt->llt_ifp);
 	for (i = 0; i < llt->llt_hsize; i++) {
 		LIST_FOREACH(lle, &llt->lle_head[i], lle_next) {
 			llatbl_lle_show((struct llentry_sa *)lle);
 			if (db_pager_quit)
 				return;
+		}
+	}
+}
 DB_SHOW_COMMAND(lltable, db_show_lltable)
+{
 	if (!have_addr) {
 		db_printf("usage: show lltable <struct lltable *>\n");
 		return;
+	}
 	llatbl_llt_show((struct lltable *)addr);
+}
 DB_SHOW_ALL_COMMAND(lltables, db_show_all_lltables)
+{
 	VNET_ITERATOR_DECL(vnet_iter);
 	struct lltable *llt;
 	VNET_FOREACH(vnet_iter) {
 		CURVNET_SET_QUIET(vnet_iter);
 #ifdef VIMAGE
 		db_printf("vnet=%p\n", curvnet);
 #endif
 		SLIST_FOREACH(llt, &lltables, llt_link) {
 			db_printf("llt=%p llt_af=%d llt_ifp=%p(%s)\n",
 			    llt, llt->llt_af, llt->llt_ifp,
 			    (llt->llt_ifp != NULL) ?
 				llt->llt_ifp->if_xname : "?");
 			if (have_addr && addr != 0) /* verbose */
 				llatbl_llt_show(llt);
 			if (db_pager_quit) {
 				CURVNET_RESTORE();
 				return;
+			}
+		}
 		CURVNET_RESTORE();
+	}
+}
 #endif /* DDB */
 #endif /* __FreeBSD__ */