Module Name: src
Committed By: riz
Date: Tue Oct 23 16:19:48 UTC 2012
Modified Files:
src/sys/net [netbsd-6]: if_arcsubr.c
src/sys/netinet [netbsd-6]: if_atm.c ip_mroute.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #616):
sys/netinet/if_atm.c: revision 1.33
sys/net/if_arcsubr.c: revision 1.64
sys/netinet/ip_mroute.c: revision 1.126
Add missing "\n" in log(9)
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.14.1 src/sys/net/if_arcsubr.c
cvs rdiff -u -r1.32 -r1.32.10.1 src/sys/netinet/if_atm.c
cvs rdiff -u -r1.122 -r1.122.2.1 src/sys/netinet/ip_mroute.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_arcsubr.c
diff -u src/sys/net/if_arcsubr.c:1.63 src/sys/net/if_arcsubr.c:1.63.14.1
--- src/sys/net/if_arcsubr.c:1.63 Mon Apr 5 07:22:22 2010
+++ src/sys/net/if_arcsubr.c Tue Oct 23 16:19:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arcsubr.c,v 1.63 2010/04/05 07:22:22 joerg Exp $ */
+/* $NetBSD: if_arcsubr.c,v 1.63.14.1 2012/10/23 16:19:47 riz Exp $ */
/*
* Copyright (c) 1994, 1995 Ignatios Souvatzis
@@ -35,7 +35,7 @@
*/
#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.63.14.1 2012/10/23 16:19:47 riz Exp $");
#include "opt_inet.h"
@@ -633,7 +633,7 @@ arc_ifattach(struct ifnet *ifp, uint8_t
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;
Index: src/sys/netinet/if_atm.c
diff -u src/sys/netinet/if_atm.c:1.32 src/sys/netinet/if_atm.c:1.32.10.1
--- src/sys/netinet/if_atm.c:1.32 Tue Feb 1 19:43:12 2011
+++ src/sys/netinet/if_atm.c Tue Oct 23 16:19:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atm.c,v 1.32 2011/02/01 19:43:12 chuck Exp $ */
+/* $NetBSD: if_atm.c,v 1.32.10.1 2012/10/23 16:19:47 riz Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,7 +30,7 @@
*/
#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.32.10.1 2012/10/23 16:19:47 riz Exp $");
#include "opt_inet.h"
#include "opt_natm.h"
@@ -125,7 +125,7 @@ atm_rtrequest(int req, struct rtentry *r
}
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;
}
@@ -228,7 +228,7 @@ atmresolve(struct rtentry *rt, struct mb
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;
}
Index: src/sys/netinet/ip_mroute.c
diff -u src/sys/netinet/ip_mroute.c:1.122 src/sys/netinet/ip_mroute.c:1.122.2.1
--- src/sys/netinet/ip_mroute.c:1.122 Mon Dec 19 11:59:57 2011
+++ src/sys/netinet/ip_mroute.c Tue Oct 23 16:19:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_mroute.c,v 1.122 2011/12/19 11:59:57 drochner Exp $ */
+/* $NetBSD: ip_mroute.c,v 1.122.2.1 2012/10/23 16:19:47 riz Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.122 2011/12/19 11:59:57 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.122.2.1 2012/10/23 16:19:47 riz Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -3027,7 +3027,7 @@ pim_register_send(struct ip *ip, struct
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)
@@ -3147,7 +3147,7 @@ pim_register_send_upcall(struct ip *ip,
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;
}
@@ -3315,7 +3315,7 @@ pim_input(struct mbuf *m, ...)
} 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;
}
