summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx/wl1271_tx.c
diff options
context:
space:
mode:
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>2010-03-26 13:53:27 +0300
committerJohn W. Linville <linville@tuxdriver.com>2010-03-31 22:39:15 +0400
commitcbf7f3058ea17d9413a6889c3a229e8eac7a7c78 (patch)
treefee31dc54bd0b9ddfe6967d2aaa376aa39bc9203 /drivers/net/wireless/wl12xx/wl1271_tx.c
parent64e29e447ec01d2130b4c68f3459cfaa94fa138b (diff)
downloadlinux-cbf7f3058ea17d9413a6889c3a229e8eac7a7c78.tar.xz
wl1271: Fix memory leak in firmware crash scenario
The driver tx-queue flush operation leaks broadcast-frames. This leak occurs if the driver is shut down while there are frames in TX buffers (such as in a firmware crash scenario.) Fix the leak. Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Reviewed-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_tx.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_tx.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.c b/drivers/net/wireless/wl12xx/wl1271_tx.c
index 5712489f5ddb..66b48b70444e 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_tx.c
@@ -426,8 +426,10 @@ void wl1271_tx_flush(struct wl1271 *wl)
wl1271_debug(DEBUG_TX, "flushing skb 0x%p", skb);
- if (!(info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS))
- continue;
+ if (!(info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS)) {
+ kfree_skb(skb);
+ continue;
+ }
ieee80211_tx_status(wl->hw, skb);
}
@@ -437,8 +439,10 @@ void wl1271_tx_flush(struct wl1271 *wl)
skb = wl->tx_frames[i];
info = IEEE80211_SKB_CB(skb);
- if (!(info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS))
+ if (!(info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS)) {
+ kfree_skb(skb);
continue;
+ }
ieee80211_tx_status(wl->hw, skb);
wl->tx_frames[i] = NULL;