From 25d3931a9fbbd356010b90de841adbe8bafec497 Mon Sep 17 00:00:00 2001
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 31 May 2010 21:14:56 +0000
Subject: [PATCH] Merge r200899 from head to stable/8:
When warning about possible netisr configuration problems during boot,
report using "netisr_init" rather than "netisr2", which was the development
name for the project.
Approved by: re (kib)
---
sys/net/netisr.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/net/netisr.c b/sys/net/netisr.c
index c8da579834e3..6de60f925498 100644
--- a/sys/net/netisr.c
+++ b/sys/net/netisr.c
@@ -1068,12 +1068,12 @@ netisr_init(void *arg)
if (netisr_maxthreads < 1)
netisr_maxthreads = 1;
if (netisr_maxthreads > mp_ncpus) {
- printf("netisr2: forcing maxthreads from %d to %d\n",
+ printf("netisr_init: forcing maxthreads from %d to %d\n",
netisr_maxthreads, mp_ncpus);
netisr_maxthreads = mp_ncpus;
}
if (netisr_defaultqlimit > netisr_maxqlimit) {
- printf("netisr2: forcing defaultqlimit from %d to %d\n",
+ printf("netisr_init: forcing defaultqlimit from %d to %d\n",
netisr_defaultqlimit, netisr_maxqlimit);
netisr_defaultqlimit = netisr_maxqlimit;
}
@@ -1084,8 +1084,8 @@ netisr_init(void *arg)
* polling disables parallel netisr workers.
*/
if (netisr_maxthreads != 1 || netisr_bindthreads != 0) {
- printf("netisr2: forcing maxthreads to 1 and bindthreads to "
- "0 for device polling\n");
+ printf("netisr_init: forcing maxthreads to 1 and "
+ "bindthreads to 0 for device polling\n");
netisr_maxthreads = 1;
netisr_bindthreads = 0;
}