summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54/p54pci.c
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2010-04-30 15:13:00 -0700
committerReinette Chatre <reinette.chatre@intel.com>2010-04-30 15:13:00 -0700
commitad41ee3a45c7de33cfa0057f4a12362ba1f1af32 (patch)
tree84ad26649f4fce8a3816351ab1d511cf6c6f0bf1 /drivers/net/wireless/p54/p54pci.c
parent49b5c7f473f1bbcb30275dcaee2c06dfb8ec2279 (diff)
parent96ff56419504ac6a610ff1af42330e0423242e16 (diff)
Merge branch 'wireless-2.6' into wireless-next-2.6
Patch "iwlwifi: work around passive scan issue" was merged into wireless-2.6, but touched a lot of code since modified (and moved) in wireless-next-2.6. This caused some conflicts. Conflicts: drivers/net/wireless/iwlwifi/iwl-scan.c Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/p54/p54pci.c')
-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 fc67888db0c..d7b9f48b3d3 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) {