From e5a1003e916daaf550ac7e50091f754bbb7dad7c Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Fri, 5 Mar 2010 21:12:02 +0100 Subject: [PATCH] Added MIMO PS flag to Tx debugging messages --- rt2860.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/rt2860.c b/rt2860.c index 18cc80b..0006670 100644 --- a/rt2860.c +++ b/rt2860.c @@ -3737,7 +3737,7 @@ static int rt2860_tx_mgmt(struct rt2860_softc *sc, u_int hdrsize, hdrspace; uint8_t rate, stbc, shortgi, mcs, pid, qsel; uint16_t len, dmalen, mpdu_len, dur; - int error, ndmasegs, ndescs, i, j; + int error, mimops, ndmasegs, ndescs, i, j; KASSERT(qid >= 0 && qid < RT2860_SOFTC_TX_RING_COUNT, ("%s: Tx MGMT: invalid qid=%d\n", @@ -3797,6 +3797,12 @@ static int rt2860_tx_mgmt(struct rt2860_softc *sc, mcs = 7; } } + + mimops = 1; + } + else + { + mimops = 0; } pid = mcs; @@ -4017,10 +4023,10 @@ static int rt2860_tx_mgmt(struct rt2860_softc *sc, RT2860_DPRINTF(sc, RT2860_DEBUG_TX, "%s: sending MGMT frame: qid=%d, hdrsize=%d, hdrspace=%d, len=%d, " - "stbc=%d, shortgi=%d, mcs=%d, DMA len=%d, ndmasegs=%d, DMA ds_len=%d/%d/%d/%d/%d\n", + "stbc=%d, shortgi=%d, mcs=%d, mimops=%d, DMA len=%d, ndmasegs=%d, DMA ds_len=%d/%d/%d/%d/%d\n", device_get_nameunit(sc->dev), qid, hdrsize, hdrspace, m->m_pkthdr.len + hdrsize, - stbc, shortgi, mcs, dmalen, ndmasegs, + stbc, shortgi, mcs, mimops, dmalen, ndmasegs, (int) dma_seg[0].ds_len, (int) dma_seg[1].ds_len, (int) dma_seg[2].ds_len, (int) dma_seg[3].ds_len, (int) dma_seg[4].ds_len); bus_dmamap_sync(ring->seg0_dma_tag, ring->seg0_dma_map, @@ -4066,7 +4072,7 @@ static int rt2860_tx_data(struct rt2860_softc *sc, u_int hdrsize, hdrspace; uint8_t type, rate, bw, stbc, shortgi, mcs, pid, wcid, mpdu_density, bawin_size, qsel; uint16_t qos, len, dmalen, mpdu_len, dur; - int error, hasqos, ac, tid, ampdu, ndmasegs, ndescs, i, j; + int error, hasqos, ac, tid, ampdu, mimops, ndmasegs, ndescs, i, j; KASSERT(qid >= 0 && qid < RT2860_SOFTC_TX_RING_COUNT, ("%s: Tx data: invalid qid=%d\n", @@ -4153,6 +4159,12 @@ static int rt2860_tx_data(struct rt2860_softc *sc, mcs = 7; } } + + mimops = 1; + } + else + { + mimops = 0; } pid = mcs; @@ -4406,10 +4418,10 @@ static int rt2860_tx_data(struct rt2860_softc *sc, RT2860_DPRINTF(sc, RT2860_DEBUG_TX, "%s: sending data: qid=%d, hdrsize=%d, hdrspace=%d, len=%d, " - "bw=%d, stbc=%d, shortgi=%d, mcs=%d, wcid=0x%02x, ampdu=%d, DMA len=%d, ndmasegs=%d, DMA ds_len=%d/%d/%d/%d/%d\n", + "bw=%d, stbc=%d, shortgi=%d, mcs=%d, wcid=0x%02x, ampdu=%d, mimops=%d, DMA len=%d, ndmasegs=%d, DMA ds_len=%d/%d/%d/%d/%d\n", device_get_nameunit(sc->dev), qid, hdrsize, hdrspace, m->m_pkthdr.len + hdrsize, - bw, stbc, shortgi, mcs, wcid, ampdu, dmalen, ndmasegs, + bw, stbc, shortgi, mcs, wcid, ampdu, mimops, dmalen, ndmasegs, (int) dma_seg[0].ds_len, (int) dma_seg[1].ds_len, (int) dma_seg[2].ds_len, (int) dma_seg[3].ds_len, (int) dma_seg[4].ds_len); bus_dmamap_sync(ring->seg0_dma_tag, ring->seg0_dma_map, -- 2.11.4.GIT