View | Details | Raw Unified | Return to bug 197143 | Differences between
and this patch

Collapse All | Expand All

(-)sys/dev/wpi/if_wpi.c (-4 / +7 lines)
Lines 1965-1970 Link Here
1965
	if ((desc->qid & WPI_RX_DESC_QID_MSK) != WPI_CMD_QUEUE_NUM)
1965
	if ((desc->qid & WPI_RX_DESC_QID_MSK) != WPI_CMD_QUEUE_NUM)
1966
		return;	/* Not a command ack. */
1966
		return;	/* Not a command ack. */
1967
1967
1968
	KASSERT(ring->queued == 0, ("ring->queued must be 0"));
1969
1968
	data = &ring->data[desc->idx];
1970
	data = &ring->data[desc->idx];
1969
1971
1970
	/* If the command was mapped in an mbuf, free it. */
1972
	/* If the command was mapped in an mbuf, free it. */
Lines 2404-2415 Link Here
2404
	ring->cur = (ring->cur + 1) % WPI_TX_RING_COUNT;
2406
	ring->cur = (ring->cur + 1) % WPI_TX_RING_COUNT;
2405
	wpi_update_tx_ring(sc, ring);
2407
	wpi_update_tx_ring(sc, ring);
2406
2408
2407
	/* Mark TX ring as full if we reach a certain threshold. */
2409
	if (ring->qid < WPI_CMD_QUEUE_NUM) {
2408
	if (++ring->queued > WPI_TX_RING_HIMARK)
2410
		/* Mark TX ring as full if we reach a certain threshold. */
2409
		sc->qfullmsk |= 1 << ring->qid;
2411
		if (++ring->queued > WPI_TX_RING_HIMARK)
2412
			sc->qfullmsk |= 1 << ring->qid;
2410
2413
2411
	if (ring->qid < WPI_CMD_QUEUE_NUM)
2412
		sc->sc_tx_timer = 5;
2414
		sc->sc_tx_timer = 5;
2415
	}
2413
2416
2414
	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);
2417
	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);
2415
2418

Return to bug 197143