From: Hans de Goede Date: Thu, 22 Apr 2010 17:52:16 +0000 (+0200) Subject: p54pci: fix bugs in p54p_check_tx_ring X-Git-Tag: firefly_0821_release~10186^2~1678 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9121999db5232e1d81270df5d0787df1492408e7;p=firefly-linux-kernel-4.4.55.git p54pci: fix bugs in p54p_check_tx_ring commit 0250ececdf6813457c98719e2d33b3684881fde0 upstream. Hans de Goede identified a bug in p54p_check_tx_ring: there are two ring indices. 1 => tx data and 3 => tx management. But the old code had a constant "1" and this resulted in spurious dma unmapping failures. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=583623 Bug-Identified-by: Hans de Goede Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c index 1b737337fc9b..a47b41334599 100644 --- a/drivers/net/wireless/p54/p54pci.c +++ b/drivers/net/wireless/p54/p54pci.c @@ -237,7 +237,7 @@ static void p54p_check_tx_ring(struct ieee80211_hw *dev, u32 *index, u32 idx, i; i = (*index) % ring_limit; - (*index) = idx = le32_to_cpu(ring_control->device_idx[1]); + (*index) = idx = le32_to_cpu(ring_control->device_idx[ring_index]); idx %= ring_limit; while (i != idx) {