CVS commit: [netbsd-5] src/sys/netinet

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Tue Jun  9 17:31:46 UTC 2009

Modified Files:
        src/sys/netinet [netbsd-5]: ip_carp.c

Log Message:
Pull up following revision(s) (requested by taca in ticket #796):
        sys/netinet/ip_carp.c: revision 1.38
Make ip_carp.c compile, fixing usage of CARP_LOG().


To generate a diff of this commit:
cvs rdiff -u -r1.26.10.1 -r1.26.10.2 src/sys/netinet/ip_carp.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/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.26.10.1 src/sys/netinet/ip_carp.c:1.26.10.2
--- src/sys/netinet/ip_carp.c:1.26.10.1	Fri Jun  5 18:24:01 2009
+++ src/sys/netinet/ip_carp.c	Tue Jun  9 17:31:46 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_carp.c,v 1.26.10.1 2009/06/05 18:24:01 snj Exp $	*/
+/*	$NetBSD: ip_carp.c,v 1.26.10.2 2009/06/09 17:31:46 snj Exp $	*/
 /*	$OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.26.10.1 2009/06/05 18:24:01 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.26.10.2 2009/06/09 17:31:46 snj Exp $");
 
 /*
  * TODO:
@@ -697,7 +697,7 @@
 		if (timercmp(&sc_tv, &ch_tv, >) ||
 		    timercmp(&sc_tv, &ch_tv, ==)) {
 			callout_stop(&sc->sc_ad_tmo);
-			CARP_LOG(sc, "MASTER -> BACKUP (more frequent advertisement received)");
+			CARP_LOG(sc, ("MASTER -> BACKUP (more frequent advertisement received)"));
 			carp_set_state(sc, BACKUP);
 			carp_setrun(sc, 0);
 			carp_setroute(sc, RTM_DELETE);
@@ -709,7 +709,7 @@
 		 * and this one claims to be slower, treat him as down.
 		 */
 		if (carp_opts[CARPCTL_PREEMPT] && timercmp(&sc_tv, &ch_tv, <)) {
-			CARP_LOG(sc, "BACKUP -> MASTER (preempting a slower master)");
+			CARP_LOG(sc, ("BACKUP -> MASTER (preempting a slower master)"));
 			carp_master_down(sc);
 			break;
 		}
@@ -721,7 +721,7 @@
 		 */
 		sc_tv.tv_sec = sc->sc_advbase * 3;
 		if (timercmp(&sc_tv, &ch_tv, <)) {
-			CARP_LOG(sc, "BACKUP -> MASTER (master timed out)")
+			CARP_LOG(sc, ("BACKUP -> MASTER (master timed out)"));
 			carp_master_down(sc);
 			break;
 		}
@@ -1392,7 +1392,7 @@
 	case MASTER:
 		break;
 	case BACKUP:
-		CARP_LOG(sc, "INIT -> MASTER (preempting)");
+		CARP_LOG(sc, ("INIT -> MASTER (preempting)"));
 		carp_set_state(sc, MASTER);
 		carp_send_ad(sc);
 		carp_send_arp(sc);