 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_arcsubr.c,v 1.63 2010/04/05 07:22:22 joerg Exp $	*/
+/*	$NetBSD: if_arcsubr.c,v 1.64 2012/09/24 03:05:53 msaitoh Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Ignatios Souvatzis
  * Copyright (c) 1982, 1989, 1993
  *	The Regents of the University of California.  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
 @@ -25,27 +25,27 @@
  * 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.
+ *
  * from: NetBSD: if_ethersubr.c,v 1.9 1994/06/29 06:36:11 cgd Exp
  *       @(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.63 2010/04/05 07:22:22 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.64 2012/09/24 03:05:53 msaitoh Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 @@ -623,27 +623,27 @@ arc_sprintf(uint8_t *ap)
 void
 arc_ifattach(struct ifnet *ifp, uint8_t lla)
+{
 	struct arccom *ac;
 	ifp->if_type = IFT_ARCNET;
 	ifp->if_addrlen = 1;
 	ifp->if_hdrlen = ARC_HDRLEN;
 	ifp->if_dlt = DLT_ARCNET;
 	if (ifp->if_flags & IFF_BROADCAST)
 		ifp->if_flags |= IFF_MULTICAST|IFF_ALLMULTI;
 	if (ifp->if_flags & IFF_LINK0 && arc_ipmtu > ARC_PHDS_MAXMTU)
 		log(LOG_ERR,
-		    "%s: arc_ipmtu is %d, but must not exceed %d",
+		    "%s: arc_ipmtu is %d, but must not exceed %d\n",
 		    ifp->if_xname, arc_ipmtu, ARC_PHDS_MAXMTU);
 	ifp->if_output = arc_output;
 	ifp->if_input = arc_input;
 	ac = (struct arccom *)ifp;
 	ac->ac_seqid = (time_second) & 0xFFFF; /* try to make seqid unique */
 	if (lla == 0) {
 		/* XXX this message isn't entirely clear, to me -- cgd */
 		log(LOG_ERR,"%s: link address 0 reserved for broadcasts.  Please change it and ifconfig %s down up\n",
 		   ifp->if_xname, ifp->if_xname);
+	}
 	if_attach(ifp);
 	if_set_sadl(ifp, &lla, sizeof(lla), true);

 @@ -1,14 +1,14 @@
-/*      $NetBSD: if_atm.c,v 1.32 2011/02/01 19:43:12 chuck Exp $       */
+/*      $NetBSD: if_atm.c,v 1.33 2012/09/24 03:05:53 msaitoh Exp $       */
 /*
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
  * 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.
 @@ -20,27 +20,27 @@
  * 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.
  */
 /*
  * IP <=> ATM address resolution.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atm.c,v 1.32 2011/02/01 19:43:12 chuck Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atm.c,v 1.33 2012/09/24 03:05:53 msaitoh Exp $");
 #include "opt_inet.h"
 #include "opt_natm.h"
 #if defined(INET) || defined(INET6)
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 @@ -115,27 +115,27 @@ atm_rtrequest(int req, struct rtentry *r
 			    ifp->if_index, ifp->if_type,
 			    NULL, namelen, NULL, addrlen);
 			rt_setgate(rt, &u.sa);
 			gate = rt->rt_gateway;
 			break;
+		}
 		if ((rt->rt_flags & RTF_CLONING) != 0) {
 			printf("atm_rtrequest: cloning route detected?\n");
 			break;
+		}
 		if (gate->sa_family != AF_LINK ||
 		    gate->sa_len < sockaddr_dl_measure(namelen, addrlen)) {
-			log(LOG_DEBUG, "atm_rtrequest: bad gateway value");
+			log(LOG_DEBUG, "atm_rtrequest: bad gateway value\n");
 			break;
+		}
 #ifdef DIAGNOSTIC
 		if (rt->rt_ifp->if_ioctl == NULL) panic("atm null ioctl");
 #endif
 #ifdef NATM
 		/*
 		 * let native ATM know we are using this VCI/VPI
 		 * (i.e. reserve it)
 		 */
 		sin = satocsin(rt_getkey(rt));
 @@ -218,27 +218,27 @@ failed:
  *     1 == resolve OK; desten contains result
+ *
  *   XXX: will need more work if we wish to support ATMARP in the kernel,
  *   but this is enough for PVCs entered via the "route" command.
  */
 int
 atmresolve(struct rtentry *rt, struct mbuf *m, const struct sockaddr *dst,
     struct atm_pseudohdr *desten /* OUT */)
+{
 	const struct sockaddr_dl *sdl;
 	if (m->m_flags & (M_BCAST|M_MCAST)) {
-		log(LOG_INFO, "atmresolve: BCAST/MCAST packet detected/dumped");
+		log(LOG_INFO, "atmresolve: BCAST/MCAST packet detected/dumped\n");
 		goto bad;
+	}
 	if (rt == NULL) {
 		rt = RTALLOC1(dst, 0);
 		if (rt == NULL) goto bad; /* failed */
 		rt->rt_refcnt--;	/* don't keep LL references */
 		if ((rt->rt_flags & RTF_GATEWAY) != 0 ||
 			(rt->rt_flags & RTF_LLINFO) == 0 ||
 			/* XXX: are we using LLINFO? */
 			rt->rt_gateway->sa_family != AF_LINK) {
 				goto bad;
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_mroute.c,v 1.125 2012/05/01 15:09:36 martin Exp $	*/
+/*	$NetBSD: ip_mroute.c,v 1.126 2012/09/24 03:05:53 msaitoh Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *      The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Stephen Deering of Stanford University.
+ *
  * 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.
 @@ -83,27 +83,27 @@
  * Modified by Charles M. Hannum, NetBSD, May 1995.
  * Modified by Ahmed Helmy, SGI, June 1996
  * Modified by George Edmond Eddy (Rusty), ISI, February 1998
  * Modified by Pavlin Radoslavov, USC/ISI, May 1998, August 1999, October 2000
  * Modified by Hitoshi Asaeda, WIDE, August 2000
  * Modified by Pavlin Radoslavov, ICSI, October 2002
+ *
  * MROUTING Revision: 1.2
  * and PIM-SMv2 and PIM-DM support, advanced API support,
  * bandwidth metering and signaling
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.125 2012/05/01 15:09:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.126 2012/09/24 03:05:53 msaitoh Exp $");
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_pim.h"
 #ifdef PIM
 #define _PIM_VT 1
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 @@ -3013,27 +3013,27 @@ expire_bw_meter_process(void *unused)
  */
 #ifdef PIM
 /*
  * Send the packet up to the user daemon, or eventually do kernel encapsulation
  */
 static int
 pim_register_send(struct ip *ip, struct vif *vifp,
 	struct mbuf *m, struct mfc *rt)
+{
     struct mbuf *mb_copy, *mm;
     if (mrtdebug & DEBUG_PIM)
-        log(LOG_DEBUG, "pim_register_send: ");
+        log(LOG_DEBUG, "pim_register_send: \n");
     mb_copy = pim_register_prepare(ip, m);
     if (mb_copy == NULL)
 	return ENOBUFS;
     /*
      * Send all the fragments. Note that the mbuf for each fragment
      * is freed by the sending machinery.
      */
     for (mm = mb_copy; mm; mm = mb_copy) {
 	mb_copy = mm->m_nextpkt;
 	mm->m_nextpkt = NULL;
 	mm = m_pullup(mm, sizeof(struct ip));
 @@ -3133,27 +3133,27 @@ pim_register_send_upcall(struct ip *ip,
     im->im_msgtype	= IGMPMSG_WHOLEPKT;
     im->im_mbz		= 0;
     im->im_vif		= vifp - viftable;
     im->im_src		= ip->ip_src;
     im->im_dst		= ip->ip_dst;
     k_igmpsrc.sin_addr	= ip->ip_src;
     mrtstat.mrts_upcalls++;
     if (socket_send(ip_mrouter, mb_first, &k_igmpsrc) < 0) {
 	if (mrtdebug & DEBUG_PIM)
 	    log(LOG_WARNING,
-		"mcast: pim_register_send_upcall: ip_mrouter socket queue full");
+		"mcast: pim_register_send_upcall: ip_mrouter socket queue full\n");
 	++mrtstat.mrts_upq_sockfull;
 	return ENOBUFS;
+    }
     /* Keep statistics */
     pimstat.pims_snd_registers_msgs++;
     pimstat.pims_snd_registers_bytes += len;
     return 0;
+}
 /*
  * Encapsulate the data packet in PIM Register message and send it to the RP.
 @@ -3301,27 +3301,27 @@ pim_input(struct mbuf *m, ...)
     /*
      * Validate checksum. If PIM REGISTER, exclude the data packet.
+     *
      * XXX: some older PIMv2 implementations don't make this distinction,
      * so for compatibility reason perform the checksum over part of the
      * message, and if error, then over the whole message.
      */
     if (PIM_VT_T(pim->pim_vt) == PIM_REGISTER && in_cksum(m, PIM_MINLEN) == 0) {
 	/* do nothing, checksum okay */
     } else if (in_cksum(m, datalen)) {
 	pimstat.pims_rcv_badsum++;
 	if (mrtdebug & DEBUG_PIM)
-	    log(LOG_DEBUG, "pim_input: invalid checksum");
+	    log(LOG_DEBUG, "pim_input: invalid checksum\n");
 	m_freem(m);
 	return;
+    }
     /* PIM version check */
     if (PIM_VT_V(pim->pim_vt) < PIM_VERSION) {
 	pimstat.pims_rcv_badversion++;
 	log(LOG_ERR, "pim_input: incorrect version %d, expecting %d\n",
 	    PIM_VT_V(pim->pim_vt), PIM_VERSION);
 	m_freem(m);
 	return;
+    }