Skip to content

Commit

Permalink
wl12xx: flush all Tx queues on tx_flush timeout
Browse files Browse the repository at this point in the history
Ensure our queues are empty at the end of a tx_flush(), in case we
timeout on passively waiting for them. This makes sure no left-overs are
transmitted when we are on the wrong channel.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information
Arik Nemtsov authored and Luciano Coelho committed Feb 28, 2012
1 parent 49c9cd2 commit 18aa755
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/net/wireless/wl12xx/tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1040,6 +1040,7 @@ void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues)
void wl1271_tx_flush(struct wl1271 *wl)
{
unsigned long timeout;
int i;
timeout = jiffies + usecs_to_jiffies(WL1271_TX_FLUSH_TIMEOUT);

while (!time_after(jiffies, timeout)) {
Expand All @@ -1057,6 +1058,12 @@ void wl1271_tx_flush(struct wl1271 *wl)
}

wl1271_warning("Unable to flush all TX buffers, timed out.");

/* forcibly flush all Tx buffers on our queues */
mutex_lock(&wl->mutex);
for (i = 0; i < WL12XX_MAX_LINKS; i++)
wl1271_tx_reset_link_queues(wl, i);
mutex_unlock(&wl->mutex);
}

u32 wl1271_tx_min_rate_get(struct wl1271 *wl, u32 rate_set)
Expand Down

0 comments on commit 18aa755

Please sign in to comment.