patch "staging: vt6655: device_free_tx_buf use only" added to staging-linus

This is a note to let you know that I've just added the patch titled

staging: vt6655: device_free_tx_buf use only

to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

From: Malcolm Priestley <[email protected]>
Date: Thu, 9 Apr 2015 20:53:43 +0100
Subject: staging: vt6655: device_free_tx_buf use only
ieee80211_tx_status_irqsafe

TD_FLAGS_NETIF_SKB is only for data.

Fixes issue of ack frames not being reported.

---
 drivers/staging/vt6655/device_main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

index 4bb4f8ee4132..7cd548428a8f 100644
@@ -989,10 +989,8 @@ static void device_free_tx_buf(struct vnt_private *pDevice, PSTxDesc pDesc)
 				 skb->len, DMA_TO_DEVICE);
 	}
 
-	if (pTDInfo->byFlags & TD_FLAGS_NETIF_SKB)
+	if (skb)
 		ieee80211_tx_status_irqsafe(pDevice->hw, skb);
-	else
-		dev_kfree_skb_irq(skb);
 
 	pTDInfo->skb_dma = 0;
 	pTDInfo->skb = NULL;

2.4.0