summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-30 12:54:15 -0700
committerDavid S. Miller <davem@davemloft.net>2010-04-30 12:54:15 -0700
commit6c9ae016a8e2aff931391d3baa9ce6cb0ffa633c (patch)
tree38a179b61e66b8b511b2b72da1f4486ee89b9821 /drivers
parent0c75ba22541ccea88e89782373991109a7ec2a54 (diff)
parent0250ececdf6813457c98719e2d33b3684881fde0 (diff)
downloadlinux-6c9ae016a8e2aff931391d3baa9ce6cb0ffa633c.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers')
-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 269fda362836..c24067f1a0cb 100644
--- 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) {