diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-03 22:53:49 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-03 22:53:49 +0400 |
| commit | 1d7d969dd0b467ba32cf3829e8bf104a5084150d (patch) | |
| tree | f0de3aca8a33bed612ba2c09f61fcabe289dc14d /drivers/net/wireless/p54 | |
| parent | 12ef116bf750c221e214e33c61e7f4c98300b5fd (diff) | |
| parent | f8478df1eab2f11aefc4b6668c5867949ab96bd7 (diff) | |
| download | linux-1d7d969dd0b467ba32cf3829e8bf104a5084150d.tar.xz | |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
Diffstat (limited to 'drivers/net/wireless/p54')
| -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 fc67888db0ca..d7b9f48b3d3f 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, 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) { |