From: Maya Erez Date: Mon, 16 May 2016 19:23:33 +0000 (+0300) Subject: wil6210: fix dma mapping error cleanup in __wil_tx_vring_tso X-Git-Tag: v4.8-rc1~140^2~279^2^2~23 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a1526f7eafa434f756579e2bc784b7605f96bf3e;p=linux-2.6-block.git wil6210: fix dma mapping error cleanup in __wil_tx_vring_tso 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 Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c index 483e0634041c..f2f6a404d3d1 100644 --- a/drivers/net/wireless/ath/wil6210/txrx.c +++ b/drivers/net/wireless/ath/wil6210/txrx.c @@ -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;