From 215177e6063bcfd4abff6b66fa05bcb7c3ea363c Mon Sep 17 00:00:00 2001 From: Maya Erez Date: Sun, 29 May 2016 08:46:34 +0300 Subject: [PATCH] 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. Change-Id: I81b99522ada809fa375c6b6887f8ea0e6482fba3 Signed-off-by: Maya Erez Signed-off-by: Kalle Valo Git-commit: a1526f7eafa434f756579e2bc784b7605f96bf3e Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git CRs-Fixed: 1015627 Signed-off-by: Maya Erez --- drivers/net/wireless/ath/wil6210/txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;