wil6210: avoid Tx descriptor double write
authorVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Sun, 1 Feb 2015 08:55:12 +0000 (10:55 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 3 Feb 2015 13:36:33 +0000 (15:36 +0200)
Non-cacheable Tx descriptor for the last fragment of
multi-fragment frame used to be written back twice.

Refactor code to always write non-cacheable descriptor
only once

Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/ath/wil6210/txrx.c

index 24c4b9a6a0046206de08a6ae7de98e237d5f569b..e37cab1c5a5384c9f5378544682e88f9d0531d17 100644 (file)
@@ -981,8 +981,6 @@ static int wil_tx_vring(struct wil6210_priv *wil, struct vring *vring,
 
        vring->ctx[i].nr_frags = nr_frags;
        wil_tx_desc_set_nr_frags(d, nr_frags);
-       if (nr_frags)
-               *_d = *d;
 
        /* middle segments */
        for (; f < nr_frags; f++) {
@@ -990,6 +988,7 @@ static int wil_tx_vring(struct wil6210_priv *wil, struct vring *vring,
                                &skb_shinfo(skb)->frags[f];
                int len = skb_frag_size(frag);
 
+               *_d = *d;
                i = (swhead + f + 1) % vring->size;
                _d = &vring->va[i].tx;
                pa = skb_frag_dma_map(dev, frag, 0, skb_frag_size(frag),
@@ -1003,7 +1002,6 @@ static int wil_tx_vring(struct wil6210_priv *wil, struct vring *vring,
                 * it will succeed here too
                 */
                wil_tx_desc_offload_cksum_set(wil, d, skb);
-               *_d = *d;
        }
        /* for the last seg only */
        d->dma.d0 |= BIT(DMA_CFG_DESC_TX_0_CMD_EOP_POS);