aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2010-04-22 13:52:16 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-04-26 14:18:42 -0400
commit0250ececdf6813457c98719e2d33b3684881fde0 (patch)
treeadaa956def6a31544d7bd11f565ed8d34f9512e4
parentfe6f212ce12341df18ef9b890bea739b4547157b (diff)
p54pci: fix bugs in p54p_check_tx_ring
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. Cc: stable@kernel.org Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=583623 Bug-Identified-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/p54/p54pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index ed4bdffdd63e..21f673d8565f 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -245,7 +245,7 @@ static void p54p_check_tx_ring(struct ieee80211_hw *dev, u32 *index,
245 u32 idx, i; 245 u32 idx, i;
246 246
247 i = (*index) % ring_limit; 247 i = (*index) % ring_limit;
248 (*index) = idx = le32_to_cpu(ring_control->device_idx[1]); 248 (*index) = idx = le32_to_cpu(ring_control->device_idx[ring_index]);
249 idx %= ring_limit; 249 idx %= ring_limit;
250 250
251 while (i != idx) { 251 while (i != idx) {