mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

Revert 281276 as unnecessary. Proper change to be committed

Browse Source 
to the base polling code in a subsequent commit.

Pointed out by: glebius

Sponsored by:	Rubicon Communications (NetGate)
This commit is contained in:
George V. Neville-Neil 2015-04-09 14:44:30 +00:00
parent 56ad941995
commit 51d4054eeb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=281312
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/net/netisr.c
View File

@ -126,13 +126,6 @@ static struct rmlock netisr_rmlock;
static SYSCTL_NODE(_net, OID_AUTO, isr, CTLFLAG_RW, 0, "netisr");
#ifdef DEVICE_POLLING
static int netisr_polling = 0; /* Enable Polling. */
TUNABLE_INT("net.isr.polling_enable", &netisr_polling);
SYSCTL_INT(_net_isr, OID_AUTO, polling_enable, CTLFLAG_RW,
&netisr_polling, 0, "Enable polling");
#endif
/*-
* Three global direct dispatch policies are supported:
*
@ -796,11 +789,9 @@ swi_net(void *arg)
nwsp = arg;
#ifdef DEVICE_POLLING
if (netisr_polling) {
KASSERT(nws_count == 1,
("%s: device_polling but nws_count != 1", __func__));
netisr_poll();
}
KASSERT(nws_count == 1,
("%s: device_polling but nws_count != 1", __func__));
netisr_poll();
#endif
#ifdef NETISR_LOCKING
NETISR_RLOCK(&tracker);
@ -825,8 +816,7 @@ swi_net(void *arg)
NETISR_RUNLOCK(&tracker);
#endif
#ifdef DEVICE_POLLING
if (netisr_polling)
netisr_pollmore();
netisr_pollmore();
#endif
}
@ -1081,9 +1071,6 @@ netisr_sched_poll(void)
{
struct netisr_workstream *nwsp;
if (!netisr_polling)
return;
nwsp = DPCPU_ID_PTR(nws_array[0], nws);
NWS_SIGNAL(nwsp);
}
@ -1151,7 +1138,7 @@ netisr_init(void *arg)
* multiple netisr threads, so for the time being compiling in device
* polling disables parallel netisr workers.
*/
if (netisr_polling && (netisr_maxthreads != 1 || netisr_bindthreads != 0)) {
if (netisr_maxthreads != 1 || netisr_bindthreads != 0) {
printf("netisr_init: forcing maxthreads to 1 and "
"bindthreads to 0 for device polling\n");
netisr_maxthreads = 1;