diff options
author | gnn <gnn@FreeBSD.org> | 2015-04-09 14:44:30 +0000 |
---|---|---|
committer | gnn <gnn@FreeBSD.org> | 2015-04-09 14:44:30 +0000 |
commit | a54f0e733cc6bb686016ffe864767c4fe5cca443 (patch) | |
tree | 3605676a08d41f0b8f6e57290d29e4b1d9e8bdcb /sys/net/netisr.c | |
parent | c4c8403c3f4700c606b6ceb7a8c3e4f067d9e5c3 (diff) | |
download | FreeBSD-src-a54f0e733cc6bb686016ffe864767c4fe5cca443.zip FreeBSD-src-a54f0e733cc6bb686016ffe864767c4fe5cca443.tar.gz |
Revert 281276 as unnecessary. Proper change to be committed
to the base polling code in a subsequent commit.
Pointed out by: glebius
Sponsored by: Rubicon Communications (NetGate)
Diffstat (limited to 'sys/net/netisr.c')
-rw-r--r-- | sys/net/netisr.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/sys/net/netisr.c b/sys/net/netisr.c index f43ed34..178c3cb 100644 --- a/sys/net/netisr.c +++ b/sys/net/netisr.c @@ -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 @@ out: 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; |