---

yaml --- r: 194132 b: refs/heads/master c: cbf7f30 h: refs/heads/master v: v3
git-mirror · Mar 31, 2010 · 6130af3 · 6130af3
1 parent b2cb4d7
commit 6130af3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64e29e447ec01d2130b4c68f3459cfaa94fa138b
+refs/heads/master: cbf7f3058ea17d9413a6889c3a229e8eac7a7c78
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_tx.c b/trunk/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;