summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/altq/altq_hfsc.c10
-rw-r--r--sys/altq/altq_priq.c8
-rw-r--r--sys/altq/altq_rio.c3
-rw-r--r--sys/altq/altq_rmclass.c6
4 files changed, 17 insertions, 10 deletions
diff --git a/sys/altq/altq_hfsc.c b/sys/altq/altq_hfsc.c
index d9c45b80c33..5646337e007 100644
--- a/sys/altq/altq_hfsc.c
+++ b/sys/altq/altq_hfsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_hfsc.c,v 1.6 2002/11/26 01:03:34 henning Exp $ */
+/* $OpenBSD: altq_hfsc.c,v 1.7 2002/11/29 07:52:31 kjc Exp $ */
/* $KAME: altq_hfsc.c,v 1.13 2002/05/16 11:02:58 kjc Exp $ */
/*
@@ -281,7 +281,9 @@ hfsc_class_create(hif, sc, parent, qlimit, flags)
#ifndef ALTQ_RED
if (flags & HFCF_RED) {
+#ifdef ALTQ_DEBUG
printf("hfsc_class_create: RED not configured for HFSC!\n");
+#endif
return (NULL);
}
#endif
@@ -1473,7 +1475,7 @@ hfscioctl(dev, cmd, addr, flag, p)
case HFSC_ENABLE:
if (hif->hif_defaultclass == NULL) {
-#if 1
+#ifdef ALTQ_DEBUG
printf("hfsc: no default class\n");
#endif
error = EINVAL;
@@ -1646,7 +1648,7 @@ hfsccmd_add_filter(ap)
return (EINVAL);
if (is_a_parent_class(cl)) {
-#if 1
+#ifdef ALTQ_DEBUG
printf("hfsccmd_add_filter: not a leaf class!\n");
#endif
return (EINVAL);
@@ -1769,7 +1771,7 @@ clh_to_clp(hif, chandle)
cl = (struct hfsc_class *)chandle;
if (chandle != ALIGN(cl)) {
-#if 1
+#ifdef ALTQ_DEBUG
printf("clh_to_cl: unaligned pointer %p\n", cl);
#endif
return (NULL);
diff --git a/sys/altq/altq_priq.c b/sys/altq/altq_priq.c
index 994a89b6afd..96fe6219a44 100644
--- a/sys/altq/altq_priq.c
+++ b/sys/altq/altq_priq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_priq.c,v 1.5 2002/11/26 01:03:34 henning Exp $ */
+/* $OpenBSD: altq_priq.c,v 1.6 2002/11/29 07:52:31 kjc Exp $ */
/* $KAME: altq_priq.c,v 1.1 2000/10/18 09:15:23 kjc Exp $ */
/*
* Copyright (C) 2000
@@ -196,7 +196,9 @@ priq_class_create(pif, pri, qlimit, flags)
#ifndef ALTQ_RED
if (flags & PRCF_RED) {
+#ifdef ALTQ_DEBUG
printf("priq_class_create: RED not configured for PRIQ!\n");
+#endif
return (NULL);
}
#endif
@@ -565,7 +567,7 @@ priqioctl(dev, cmd, addr, flag, p)
switch (cmd) {
case PRIQ_ENABLE:
if (pif->pif_default == NULL) {
-#if 1
+#ifdef ALTQ_DEBUG
printf("priq: no default class\n");
#endif
error = EINVAL;
@@ -823,7 +825,7 @@ clh_to_clp(pif, chandle)
cl = (struct priq_class *)chandle;
if (chandle != ALIGN(cl)) {
-#if 1
+#ifdef ALTQ_DEBUG
printf("clh_to_cl: unaligned pointer %p\n", cl);
#endif
return (NULL);
diff --git a/sys/altq/altq_rio.c b/sys/altq/altq_rio.c
index 329bd129657..a18795121fe 100644
--- a/sys/altq/altq_rio.c
+++ b/sys/altq/altq_rio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_rio.c,v 1.5 2002/11/26 01:03:34 henning Exp $ */
+/* $OpenBSD: altq_rio.c,v 1.6 2002/11/29 07:52:31 kjc Exp $ */
/* $KAME: altq_rio.c,v 1.8 2000/12/14 08:12:46 thorpej Exp $ */
/*
@@ -144,7 +144,6 @@
delta = (a)->tv_usec - (b)->tv_usec; \
if ((xxs = (a)->tv_sec - (b)->tv_sec) != 0) { \
if (xxs < 0) { \
- printf("rm_class: bogus time values"); \
delta = 60000000; \
} else if (xxs > 4) { \
if (xxs > 60) \
diff --git a/sys/altq/altq_rmclass.c b/sys/altq/altq_rmclass.c
index d9186f8ce6a..1821a30232f 100644
--- a/sys/altq/altq_rmclass.c
+++ b/sys/altq/altq_rmclass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_rmclass.c,v 1.4 2002/11/26 01:03:34 henning Exp $ */
+/* $OpenBSD: altq_rmclass.c,v 1.5 2002/11/29 07:52:31 kjc Exp $ */
/* $KAME: altq_rmclass.c,v 1.10 2001/02/09 07:20:40 kjc Exp $ */
/*
@@ -199,13 +199,17 @@ rmc_newclass(pri, ifd, nsecPerByte, action, maxq, parent, borrow,
return (NULL);
#ifndef ALTQ_RED
if (flags & RMCF_RED) {
+#ifdef ALTQ_DEBUG
printf("rmc_newclass: RED not configured for CBQ!\n");
+#endif
return (NULL);
}
#endif
#ifndef ALTQ_RIO
if (flags & RMCF_RIO) {
+#ifdef ALTQ_DEBUG
printf("rmc_newclass: RIO not configured for CBQ!\n");
+#endif
return (NULL);
}
#endif