Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

6c9ae016 · David S. Miller · 0c75ba22 · 0250ecec · 6c9ae016
Commit 6c9ae016 authored Apr 30, 2010 by David S. Miller
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/net/wireless/p54/p54pci.c drivers/net/wireless/p54/p54pci.c +1 -1

No files found.
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -246,7 +246,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) {