| Message ID | 1303134251-31514-1-git-send-email-ido@wizery.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Mon, 2011-04-18 at 16:44 +0300, Ido Yariv wrote: > The driver stops sending TX packets when either there aren't enough > memory blocks, or it runs out of TX descriptors. The driver continues to > send packets to the FW only when more memory blocks are available. > > The FW might free TX descriptors without freeing the corresponding > memory blocks, especially when dynamic memory is enabled. In cases where > memory blocks are not freed at all, the driver will keep waiting for > more memory blocks indefinitely. > > Fix this by clearing the WL1271_FLAG_FW_TX_BUSY flag when there are > available TX descriptors. > > Signed-off-by: Ido Yariv <ido@wizery.com> > --- Thanks, Ido. Applied.
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c index 7a3339f..5a1575f 100644 --- a/drivers/net/wireless/wl12xx/tx.c +++ b/drivers/net/wireless/wl12xx/tx.c @@ -65,6 +65,9 @@ static int wl1271_alloc_tx_id(struct wl1271 *wl, struct sk_buff *skb) static void wl1271_free_tx_id(struct wl1271 *wl, int id) { if (__test_and_clear_bit(id, wl->tx_frames_map)) { + if (unlikely(wl->tx_frames_cnt == ACX_TX_DESCRIPTORS)) + clear_bit(WL1271_FLAG_FW_TX_BUSY, &wl->flags); + wl->tx_frames[id] = NULL; wl->tx_frames_cnt--; }
The driver stops sending TX packets when either there aren't enough memory blocks, or it runs out of TX descriptors. The driver continues to send packets to the FW only when more memory blocks are available. The FW might free TX descriptors without freeing the corresponding memory blocks, especially when dynamic memory is enabled. In cases where memory blocks are not freed at all, the driver will keep waiting for more memory blocks indefinitely. Fix this by clearing the WL1271_FLAG_FW_TX_BUSY flag when there are available TX descriptors. Signed-off-by: Ido Yariv <ido@wizery.com> --- drivers/net/wireless/wl12xx/tx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)