From owner-svn-src-head@FreeBSD.ORG Thu Apr 9 14:44:31 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5EE3F6EE; Thu, 9 Apr 2015 14:44:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31ADC20F; Thu, 9 Apr 2015 14:44:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t39EiVjL045380; Thu, 9 Apr 2015 14:44:31 GMT (envelope-from gnn@FreeBSD.org) Received: (from gnn@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t39EiVFY045379; Thu, 9 Apr 2015 14:44:31 GMT (envelope-from gnn@FreeBSD.org) Message-Id: <201504091444.t39EiVFY045379@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gnn set sender to gnn@FreeBSD.org using -f From: "George V. Neville-Neil" Date: Thu, 9 Apr 2015 14:44:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281312 - head/sys/net X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Apr 2015 14:44:31 -0000 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;