diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-30 15:54:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-30 15:54:15 -0400 |
| commit | 6c9ae016a8e2aff931391d3baa9ce6cb0ffa633c (patch) | |
| tree | 38a179b61e66b8b511b2b72da1f4486ee89b9821 | |
| parent | 0c75ba22541ccea88e89782373991109a7ec2a54 (diff) | |
| parent | 0250ececdf6813457c98719e2d33b3684881fde0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
| -rw-r--r-- | drivers/net/wireless/p54/p54pci.c | 2 |
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, | |||
| 246 | u32 idx, i; | 246 | u32 idx, i; |
| 247 | 247 | ||
| 248 | i = (*index) % ring_limit; | 248 | i = (*index) % ring_limit; |
| 249 | (*index) = idx = le32_to_cpu(ring_control->device_idx[1]); | 249 | (*index) = idx = le32_to_cpu(ring_control->device_idx[ring_index]); |
| 250 | idx %= ring_limit; | 250 | idx %= ring_limit; |
| 251 | 251 | ||
| 252 | while (i != idx) { | 252 | while (i != idx) { |