svn commit: r307563 - head/sys/net

[Sean Bruno]

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 at 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: