svn commit: r281312 - head/sys/net

[George V. Neville-Neil]

Author: gnn
Date: Thu Apr  9 14:44:30 2015
New Revision: 281312
URL: https://svnweb.freebsd.org/changeset/base/281312

Log:
  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)

Modified:
  head/sys/net/netisr.c

Modified: head/sys/net/netisr.c
==============================================================================
--- head/sys/net/netisr.c	Thu Apr  9 13:45:17 2015	(r281311)
+++ head/sys/net/netisr.c	Thu Apr  9 14:44:30 2015	(r281312)
@@ -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;