D17274.id54564.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D17274.id54564.diff
View Options

	Index: head/sys/dev/cxgb/cxgb_adapter.h
	===================================================================
	--- head/sys/dev/cxgb/cxgb_adapter.h
	+++ head/sys/dev/cxgb/cxgb_adapter.h
	@@ -363,6 +363,7 @@
	unsigned int slow_intr_mask;
	unsigned long irq_stats[IRQ_NUM_STATS];

	+ unsigned nqsets;
	struct sge sge;
	struct mc7 pmrx;
	struct mc7 pmtx;
	Index: head/sys/dev/cxgb/cxgb_main.c
	===================================================================
	--- head/sys/dev/cxgb/cxgb_main.c
	+++ head/sys/dev/cxgb/cxgb_main.c
	@@ -853,6 +853,8 @@
	}
	}

	+ sc->nqsets = qset_idx;
	+
	return (0);
	}

	@@ -3598,7 +3600,7 @@
	pi = if_getsoftc(ifp);
	adap = pi->adapter;
	ADAPTER_LOCK(adap);
	- *nrxr = SGE_QSETS;
	+ *nrxr = adap->nqsets;
	*ncl = adap->sge.qs[0].fl[1].size;
	*clsize = adap->sge.qs[0].fl[1].buf_size;
	ADAPTER_UNLOCK(adap);
	@@ -3613,7 +3615,7 @@

	pi = if_getsoftc(ifp);
	if (event == NETDUMP_START)
	- for (i = 0; i < SGE_QSETS; i++) {
	+ for (i = 0; i < pi->adapter->nqsets; i++) {
	qs = &pi->adapter->sge.qs[i];

	/* Need to reinit after netdump_mbuf_dump(). */
	@@ -3650,7 +3652,7 @@
	return (ENOENT);

	adap = pi->adapter;
	- for (i = 0; i < SGE_QSETS; i++)
	+ for (i = 0; i < adap->nqsets; i++)
	(void)cxgb_netdump_poll_rx(adap, &adap->sge.qs[i]);
	(void)cxgb_netdump_poll_tx(&adap->sge.qs[pi->first_qset]);
	return (0);