From ce510bcb3f0f034b9ef138fee8bbd4b12dccb8c0 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Fri, 8 Jan 2010 16:14:41 +0000
Subject: [PATCH] Complete the swap of carp(4) log levels and document the
 change.

MFC after:	3 days
---
 share/man/man4/carp.4 | 10 +++++-----
 sys/netinet/ip_carp.c |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/share/man/man4/carp.4 b/share/man/man4/carp.4
index 8333b4a08849..a985fb8a9d83 100644
--- a/share/man/man4/carp.4
+++ b/share/man/man4/carp.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 6, 2006
+.Dd January 5, 2010
 .Dt CARP 4
 .Os
 .Sh NAME
@@ -118,12 +118,12 @@ See also the first example.
 Disabled by default.
 .It Va net.inet.carp.log
 Value of 0 disables any logging.
-Value of 1 enables logging of bad
-.Nm
-packets.
-Values above 1 enable logging state changes of
+Value of 1 enables logging state changes of
 .Nm
 interfaces.
+Values above 1 enable logging of bad
+.Nm
+packets.
 Default value is 1.
 .It Va net.inet.carp.arpbalance
 Balance local traffic using ARP (see below).
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 55fbb02fa38f..433c0f03dd54 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -560,7 +560,7 @@ carp_input(struct mbuf *m, int hlen)
 	/* verify that the IP TTL is 255.  */
 	if (ip->ip_ttl != CARP_DFLTTL) {
 		CARPSTATS_INC(carps_badttl);
-		CARP_LOG("carp_input: received ttl %d != 255i on %s\n",
+		CARP_DEBUG("carp_input: received ttl %d != 255 on %s\n",
 		    ip->ip_ttl,
 		    m->m_pkthdr.rcvif->if_xname);
 		m_freem(m);
@@ -739,7 +739,7 @@ carp_input_c(struct mbuf *m, struct carp_header *ch, sa_family_t af)
 		CARPSTATS_INC(carps_badauth);
 		SC2IFP(sc)->if_ierrors++;
 		CARP_UNLOCK(ifp->if_carp);
-		CARP_LOG("%s: incorrect hash\n", SC2IFP(sc)->if_xname);
+		CARP_DEBUG("%s: incorrect hash\n", SC2IFP(sc)->if_xname);
 		m_freem(m);
 		return;
 	}