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

Collapse All | Expand All

(-)sys/dev/wpi/if_wpi.c (-6 / +8 lines)
Lines 1172-1179 Link Here
1172
	 * to allocate commands space for other rings.
1172
	 * to allocate commands space for other rings.
1173
	 * XXX Do we really need to allocate descriptors for other rings?
1173
	 * XXX Do we really need to allocate descriptors for other rings?
1174
	 */
1174
	 */
1175
	if (qid > WPI_CMD_QUEUE_NUM)
1175
	if (qid > WPI_CMD_QUEUE_NUM) {
1176
		DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);
1176
		return 0;
1177
		return 0;
1178
	}
1177
1179
1178
	size = WPI_TX_RING_COUNT * sizeof (struct wpi_tx_cmd);
1180
	size = WPI_TX_RING_COUNT * sizeof (struct wpi_tx_cmd);
1179
	error = wpi_dma_contig_alloc(sc, &ring->cmd_dma, (void **)&ring->cmd,
1181
	error = wpi_dma_contig_alloc(sc, &ring->cmd_dma, (void **)&ring->cmd,
Lines 1991-1998 Link Here
1991
	struct wpi_tx_ring *ring = &sc->txq[WPI_CMD_QUEUE_NUM];
1993
	struct wpi_tx_ring *ring = &sc->txq[WPI_CMD_QUEUE_NUM];
1992
	struct wpi_tx_data *data;
1994
	struct wpi_tx_data *data;
1993
1995
1994
	DPRINTF(sc, WPI_DEBUG_CMD, "cmd notification qid=%x idx=%d flags=%x "
1996
	DPRINTF(sc, WPI_DEBUG_CMD, "cmd notification qid %x idx %d flags %x "
1995
				   "type=%s len=%d\n", desc->qid, desc->idx,
1997
				   "type %s len %d\n", desc->qid, desc->idx,
1996
				   desc->flags, wpi_cmd_str(desc->type),
1998
				   desc->flags, wpi_cmd_str(desc->type),
1997
				   le32toh(desc->len));
1999
				   le32toh(desc->len));
1998
2000
Lines 3027-3034 Link Here
3027
	if (async == 0)
3029
	if (async == 0)
3028
		WPI_LOCK_ASSERT(sc);
3030
		WPI_LOCK_ASSERT(sc);
3029
3031
3030
	DPRINTF(sc, WPI_DEBUG_CMD, "wpi_cmd %s size %zu async %d\n",
3032
	DPRINTF(sc, WPI_DEBUG_CMD, "%s: cmd %s size %zu async %d\n",
3031
	    wpi_cmd_str(code), size, async);
3033
	    __func__, wpi_cmd_str(code), size, async);
3032
3034
3033
	desc = &ring->desc[ring->cur];
3035
	desc = &ring->desc[ring->cur];
3034
	data = &ring->data[ring->cur];
3036
	data = &ring->data[ring->cur];
Lines 5343-5349 Link Here
5343
		}
5345
		}
5344
		if ((error = wpi_send_rxon(sc, 0, 0)) != 0)
5346
		if ((error = wpi_send_rxon(sc, 0, 0)) != 0)
5345
			device_printf(sc->sc_dev,
5347
			device_printf(sc->sc_dev,
5346
			    "%s: error %d settting channel\n", __func__,
5348
			    "%s: error %d setting channel\n", __func__,
5347
			    error);
5349
			    error);
5348
	}
5350
	}
5349
	WPI_UNLOCK(sc);
5351
	WPI_UNLOCK(sc);

Return to bug 197143