Module Name: src
Committed By: pgoyette
Date: Wed Aug 11 11:40:51 UTC 2010
Modified Files:
src/sys/dist/ipf/netinet: ip_auth.c ip_log.c ip_sync.c
Log Message:
Keep condvar wmesg's within 8-char limit.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dist/ipf/netinet/ip_auth.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dist/ipf/netinet/ip_log.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dist/ipf/netinet/ip_sync.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/dist/ipf/netinet/ip_auth.c
diff -u src/sys/dist/ipf/netinet/ip_auth.c:1.14 src/sys/dist/ipf/netinet/ip_auth.c:1.15
--- src/sys/dist/ipf/netinet/ip_auth.c:1.14 Sat Apr 17 21:00:44 2010
+++ src/sys/dist/ipf/netinet/ip_auth.c Wed Aug 11 11:40:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_auth.c,v 1.14 2010/04/17 21:00:44 darrenr Exp $ */
+/* $NetBSD: ip_auth.c,v 1.15 2010/08/11 11:40:51 pgoyette Exp $ */
/*
* Copyright (C) 1998-2003 by Darren Reed & Guido van Rooij.
@@ -124,7 +124,7 @@
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_auth.c,v 1.14 2010/04/17 21:00:44 darrenr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_auth.c,v 1.15 2010/08/11 11:40:51 pgoyette Exp $");
#else
static const char rcsid[] = "@(#)Id: ip_auth.c,v 2.73.2.34 2010/01/31 16:22:54 darrenr Exp";
#endif
@@ -183,7 +183,7 @@
MUTEX_INIT(&ipf_authmx, "ipf auth log mutex");
RWLOCK_INIT(&ipf_auth, "ipf IP User-Auth rwlock");
#if SOLARIS && defined(_KERNEL)
- cv_init(&ipfauthwait, "ipf auth condvar", CV_DRIVER, NULL);
+ cv_init(&ipfauthwait, "ipf_auth", CV_DRIVER, NULL);
#endif
#if defined(linux) && defined(_KERNEL)
init_waitqueue_head(&fr_authnext_linux);
Index: src/sys/dist/ipf/netinet/ip_log.c
diff -u src/sys/dist/ipf/netinet/ip_log.c:1.12 src/sys/dist/ipf/netinet/ip_log.c:1.13
--- src/sys/dist/ipf/netinet/ip_log.c:1.12 Wed Aug 19 08:36:11 2009
+++ src/sys/dist/ipf/netinet/ip_log.c Wed Aug 11 11:40:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_log.c,v 1.12 2009/08/19 08:36:11 darrenr Exp $ */
+/* $NetBSD: ip_log.c,v 1.13 2010/08/11 11:40:51 pgoyette Exp $ */
/*
* Copyright (C) 1997-2003 by Darren Reed.
@@ -9,7 +9,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_log.c,v 1.12 2009/08/19 08:36:11 darrenr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_log.c,v 1.13 2010/08/11 11:40:51 pgoyette Exp $");
#include <sys/param.h>
#if defined(KERNEL) || defined(_KERNEL)
@@ -205,7 +205,7 @@
}
# if SOLARIS && defined(_KERNEL)
- cv_init(&iplwait, "ipl condvar", CV_DRIVER, NULL);
+ cv_init(&iplwait, "ipf_log", CV_DRIVER, NULL);
# endif
MUTEX_INIT(&ipl_mutex, "ipf log mutex");
Index: src/sys/dist/ipf/netinet/ip_sync.c
diff -u src/sys/dist/ipf/netinet/ip_sync.c:1.13 src/sys/dist/ipf/netinet/ip_sync.c:1.14
--- src/sys/dist/ipf/netinet/ip_sync.c:1.13 Sat Apr 17 21:00:44 2010
+++ src/sys/dist/ipf/netinet/ip_sync.c Wed Aug 11 11:40:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_sync.c,v 1.13 2010/04/17 21:00:44 darrenr Exp $ */
+/* $NetBSD: ip_sync.c,v 1.14 2010/08/11 11:40:51 pgoyette Exp $ */
/*
* Copyright (C) 1995-1998 by Darren Reed.
@@ -103,7 +103,7 @@
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_sync.c,v 1.13 2010/04/17 21:00:44 darrenr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_sync.c,v 1.14 2010/08/11 11:40:51 pgoyette Exp $");
#else
static const char rcsid[] = "@(#)Id: ip_sync.c,v 2.40.2.17 2009/12/27 06:55:22 darrenr Exp";
#endif
@@ -157,7 +157,7 @@
MUTEX_INIT(&ipf_syncadd, "add things to sync table");
MUTEX_INIT(&ipsl_mutex, "add things to sync table");
# if SOLARIS && defined(_KERNEL)
- cv_init(&ipslwait, "ipsl condvar", CV_DRIVER, NULL);
+ cv_init(&ipslwait, "ipf_syn", CV_DRIVER, NULL);
# endif
bzero((char *)syncnattab, sizeof(syncnattab));