From owner-svn-src-all@freebsd.org Tue Oct 18 13:29:32 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1A605C16336; Tue, 18 Oct 2016 13:29:32 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 DA1D3C42; Tue, 18 Oct 2016 13:29:31 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9IDTUeW098024; Tue, 18 Oct 2016 13:29:30 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9IDTU8f098023; Tue, 18 Oct 2016 13:29:30 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201610181329.u9IDTU8f098023@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Tue, 18 Oct 2016 13:29:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r307563 - 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Oct 2016 13:29:32 -0000 Author: sbruno Date: Tue Oct 18 13:29:30 2016 New Revision: 307563 URL: https://svnweb.freebsd.org/changeset/base/307563 Log: When deciding whether or not to call tqg_attach_cpu(), reference rid directly. ref: https://github.com/NextBSD/NextBSD/commit/c9b47b468b8a3350811acfd9e167a8b91dc8f0c6 Submitted by: mmacy@nextbsd.org Modified: head/sys/net/iflib.c Modified: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Tue Oct 18 13:22:44 2016 (r307562) +++ head/sys/net/iflib.c Tue Oct 18 13:29:30 2016 (r307563) @@ -4327,6 +4327,7 @@ iflib_irq_alloc_generic(if_ctx_t ctx, if void *q; info = &ctx->ifc_filter_info; + tqrid = rid; switch (type) { /* XXX merge tx/rx for netmap? */ @@ -4335,7 +4336,6 @@ iflib_irq_alloc_generic(if_ctx_t ctx, if info = &ctx->ifc_txqs[qid].ift_filter_info; gtask = &ctx->ifc_txqs[qid].ift_task; tqg = qgroup_if_io_tqg; - tqrid = irq->ii_rid; fn = _task_fn_tx; break; case IFLIB_INTR_RX: @@ -4343,7 +4343,6 @@ iflib_irq_alloc_generic(if_ctx_t ctx, if info = &ctx->ifc_rxqs[qid].ifr_filter_info; gtask = &ctx->ifc_rxqs[qid].ifr_task; tqg = qgroup_if_io_tqg; - tqrid = irq->ii_rid; fn = _task_fn_rx; break; case IFLIB_INTR_ADMIN: @@ -4351,7 +4350,6 @@ iflib_irq_alloc_generic(if_ctx_t ctx, if info = &ctx->ifc_filter_info; gtask = &ctx->ifc_admin_task; tqg = qgroup_if_config_tqg; - tqrid = -1; fn = _task_fn_admin; break; default: