 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_bridge.c,v 1.110 2016/03/23 05:44:01 ozaki-r Exp $	*/
+/*	$NetBSD: if_bridge.c,v 1.111 2016/03/28 04:38:04 ozaki-r Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -70,27 +70,27 @@
 /*
  * Network interface bridge support.
+ *
  * TODO:
+ *
  *	- Currently only supports Ethernet-like interfaces (Ethernet,
  *	  802.11, VLANs on Ethernet, etc.)  Figure out a nice way
  *	  to bridge other types of interfaces (FDDI-FDDI, and maybe
  *	  consider heterogenous bridges).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.110 2016/03/23 05:44:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.111 2016/03/28 04:38:04 ozaki-r Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_bridge_ipf.h"
 #include "opt_inet.h"
 #endif /* _KERNEL_OPT */
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h> /* for softnet_lock */
 #include <sys/sockio.h>
 @@ -331,46 +331,41 @@ static const struct bridge_control bridg
 [BRDGSIFPRIO] = {bridge_ioctl_sifprio, sizeof(struct ifbreq), BC_F_COPYIN|BC_F_SUSER},
 [BRDGSIFCOST] = {bridge_ioctl_sifcost, sizeof(struct ifbreq), BC_F_COPYIN|BC_F_SUSER},
 #if defined(BRIDGE_IPF)
 [BRDGGFILT] = {bridge_ioctl_gfilt, sizeof(struct ifbrparam), BC_F_COPYOUT},
 [BRDGSFILT] = {bridge_ioctl_sfilt, sizeof(struct ifbrparam), BC_F_COPYIN|BC_F_SUSER},
 #endif /* BRIDGE_IPF */
 [BRDGGIFS] = {bridge_ioctl_gifs, sizeof(struct ifbifconf), BC_F_XLATEIN|BC_F_XLATEOUT},
 [BRDGRTS] = {bridge_ioctl_rts, sizeof(struct ifbaconf), BC_F_XLATEIN|BC_F_XLATEOUT},
 };
 static const int bridge_control_table_size = __arraycount(bridge_control_table);
 static LIST_HEAD(, bridge_softc) bridge_list;
 static kmutex_t bridge_list_lock;
 static struct if_clone bridge_cloner =
     IF_CLONE_INITIALIZER("bridge", bridge_clone_create, bridge_clone_destroy);
 /*
  * bridgeattach:
+ *
  *	Pseudo-device attach routine.
  */
 void
 bridgeattach(int n)
+{
 	pool_init(&bridge_rtnode_pool, sizeof(struct bridge_rtnode),
 , 0, 0, "brtpl", NULL, IPL_NET);
 	LIST_INIT(&bridge_list);
 	mutex_init(&bridge_list_lock, MUTEX_DEFAULT, IPL_NET);
 	if_clone_attach(&bridge_cloner);
+}
 /*
  * bridge_clone_create:
+ *
  *	Create a new bridge instance.
  */
 static int
 bridge_clone_create(struct if_clone *ifc, int unit)
+{
 	struct bridge_softc *sc;
 	struct ifnet *ifp;
 @@ -422,58 +417,50 @@ bridge_clone_create(struct if_clone *ifc
 	ifp->if_start = bridge_start;
 	ifp->if_stop = bridge_stop;
 	ifp->if_init = bridge_init;
 	ifp->if_type = IFT_BRIDGE;
 	ifp->if_addrlen = 0;
 	ifp->if_dlt = DLT_EN10MB;
 	ifp->if_hdrlen = ETHER_HDR_LEN;
 	if_initialize(ifp);
 	if_register(ifp);
 	if_alloc_sadl(ifp);
 	mutex_enter(&bridge_list_lock);
 	LIST_INSERT_HEAD(&bridge_list, sc, sc_list);
 	mutex_exit(&bridge_list_lock);
 	return (0);
+}
 /*
  * bridge_clone_destroy:
+ *
  *	Destroy a bridge instance.
  */
 static int
 bridge_clone_destroy(struct ifnet *ifp)
+{
 	struct bridge_softc *sc = ifp->if_softc;
 	struct bridge_iflist *bif;
 	int s;
 	s = splnet();
 	bridge_stop(ifp, 1);
 	BRIDGE_LOCK(sc);
 	while ((bif = LIST_FIRST(&sc->sc_iflist)) != NULL)
 		bridge_delete_member(sc, bif);
 	BRIDGE_UNLOCK(sc);
 	mutex_enter(&bridge_list_lock);
 	LIST_REMOVE(sc, sc_list);
 	mutex_exit(&bridge_list_lock);
 	splx(s);
 	if_detach(ifp);
 	/* Tear down the routing table. */
 	bridge_rtable_fini(sc);
 	cv_destroy(&sc->sc_iflist_cv);
 	if (sc->sc_iflist_psz)
 		pserialize_destroy(sc->sc_iflist_psz);
 	if (sc->sc_iflist_lock)
 		mutex_obj_free(sc->sc_iflist_lock);