diff options
| author | Eliad Peller <eliad@wizery.com> | 2011-12-13 15:26:38 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-12-15 09:58:42 +0200 |
| commit | 5de8eef4fdd2044f6981ebf62330720bcdba8ee3 (patch) | |
| tree | ab7f4f531ec4c811b8cb83cf6caf61f2ad2d63d4 /drivers/net/wireless/wl12xx/tx.c | |
| parent | 2c8f82eabc6b3b6d1fc97954377e67f2d83db687 (diff) | |
| download | blackbird-op-linux-5de8eef4fdd2044f6981ebf62330720bcdba8ee3.tar.gz blackbird-op-linux-5de8eef4fdd2044f6981ebf62330720bcdba8ee3.zip | |
wl12xx: use ieee80211_free_txskb()
Use the newly introduced ieee80211_free_txskb() instead
of dev_kfree_skb() for failed tx packets.
Additionally, if the skb is a dummy packet, re-enqueue
it (as the fw expects it) instead of freeing it.
Reported-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/tx.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/tx.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c index 7d727ee6ddf6..4508ccd78328 100644 --- a/drivers/net/wireless/wl12xx/tx.c +++ b/drivers/net/wireless/wl12xx/tx.c @@ -740,7 +740,14 @@ void wl1271_tx_work_locked(struct wl1271 *wl) set_bit(WL1271_FLAG_FW_TX_BUSY, &wl->flags); goto out_ack; } else if (ret < 0) { - dev_kfree_skb(skb); + if (wl12xx_is_dummy_packet(wl, skb)) + /* + * fw still expects dummy packet, + * so re-enqueue it + */ + wl1271_skb_queue_head(wl, wlvif, skb); + else + ieee80211_free_txskb(wl->hw, skb); goto out_ack; } buf_offset += ret; |
