]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
staging: vt6655: device_free_tx_buf use only ieee80211_tx_status_irqsafe
authorMalcolm Priestley <tvboxspy@gmail.com>
Thu, 9 Apr 2015 19:53:43 +0000 (20:53 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Jun 2015 15:20:58 +0000 (08:20 -0700)
commit 3fa0917beb29d886550fcf61a6378563d1ce9684 upstream.

TD_FLAGS_NETIF_SKB is only for data.

Fixes issue of ack frames not being reported.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/device_main.c

index 03b2a90b9ac0b6f73109686b66623c61f0cd5ccb..9db7480191ac649ecce141a3e6bada1b017dd124 100644 (file)
@@ -988,10 +988,8 @@ static void device_free_tx_buf(struct vnt_private *pDevice, PSTxDesc pDesc)
                                 PCI_DMA_TODEVICE);
        }
 
-       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;