Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
This commit is contained in:
@@ -246,7 +246,7 @@ static void p54p_check_tx_ring(struct ieee80211_hw *dev, u32 *index,
|
|||||||
u32 idx, i;
|
u32 idx, i;
|
||||||
|
|
||||||
i = (*index) % ring_limit;
|
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;
|
idx %= ring_limit;
|
||||||
|
|
||||||
while (i != idx) {
|
while (i != idx) {
|
||||||
|
Reference in New Issue
Block a user