]> git.karo-electronics.de Git - linux-beck.git/commitdiff
wil6210: fix dma mapping error cleanup in __wil_tx_vring_tso
authorMaya Erez <qca_merez@qca.qualcomm.com>
Mon, 16 May 2016 19:23:33 +0000 (22:23 +0300)
committerKalle Valo <kvalo@qca.qualcomm.com>
Sat, 28 May 2016 08:19:21 +0000 (11:19 +0300)
In case we fail to map one of the TSO SKB fragments, we need to
clear all the mapped descriptors, from swhead to swhead+descs_used-1.

Change the desc index calculation to
i = (swhead + descs_used - 1) % vring->size;
to prevent unmpping of (swhead + descs_used) descriptor that wasn't
mapped.

Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/wil6210/txrx.c

index 483e0634041c47a1e641aae9a4d31cc806f153b2..f2f6a404d3d1c3480599e13e7b54addc1858adf1 100644 (file)
@@ -1594,7 +1594,7 @@ mem_error:
        while (descs_used > 0) {
                struct wil_ctx *ctx;
 
-               i = (swhead + descs_used) % vring->size;
+               i = (swhead + descs_used - 1) % vring->size;
                d = (struct vring_tx_desc *)&vring->va[i].tx;
                _desc = &vring->va[i].tx;
                *d = *_desc;