d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge r200899 from head to stable/8:

Browse Source 
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)
This commit is contained in:
Robert Watson 2010-05-31 21:14:56 +00:00
parent 84ba62ee66
commit 25d3931a9f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/net/netisr.c
View File

@ -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;
}