diff options
| author | Himanshu Agarwal <himanaga@codeaurora.org> | 2016-10-04 23:47:34 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-10-24 12:19:00 +0530 |
| commit | 7773cba0d7da1b0b922b040783a43739b593219e (patch) | |
| tree | 62ce72f396c1bc214a876b871b17aecfe8c15cd4 | |
| parent | 9871fad10173c7423db1e6b9ce926cb3a48c6f19 (diff) | |
qcacld-2.0: Use appropriate adf API to alloc/free skb
Propagation from qcacld-3.0 to qcacld-2.0.
Use appropriate adf API to avoid false detection
of double allocation/ double free of skb.
CRs-Fixed: 914384
Change-Id: I7fef5fc602ae2108a0b24f8c47701933ea4a29fd
| -rw-r--r-- | CORE/CLD_TXRX/TXRX/ol_rx_fwd.c | 2 | ||||
| -rw-r--r-- | CORE/CLD_TXRX/TXRX/ol_tx.c | 4 | ||||
| -rw-r--r-- | CORE/CLD_TXRX/TXRX/ol_tx_queue.c | 2 | ||||
| -rw-r--r-- | CORE/CLD_TXRX/TXRX/ol_txrx.c | 2 | ||||
| -rw-r--r-- | CORE/EPPING/src/epping_tx.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/CORE/CLD_TXRX/TXRX/ol_rx_fwd.c b/CORE/CLD_TXRX/TXRX/ol_rx_fwd.c index ead13c7e1eb2..2a15b55b6e35 100644 --- a/CORE/CLD_TXRX/TXRX/ol_rx_fwd.c +++ b/CORE/CLD_TXRX/TXRX/ol_rx_fwd.c @@ -154,7 +154,7 @@ ol_rx_fwd_to_tx(struct ol_txrx_vdev_t *vdev, adf_nbuf_t msdu) * We could store the frame and try again later, * but the simplest solution is to discard the frames. */ - adf_nbuf_free(msdu); + adf_nbuf_tx_free(msdu, ADF_NBUF_PKT_ERROR); } } diff --git a/CORE/CLD_TXRX/TXRX/ol_tx.c b/CORE/CLD_TXRX/TXRX/ol_tx.c index b59577d6f114..cc195c4e7066 100644 --- a/CORE/CLD_TXRX/TXRX/ol_tx.c +++ b/CORE/CLD_TXRX/TXRX/ol_tx.c @@ -210,7 +210,7 @@ ol_tx_vdev_ll_pause_queue_send_base(struct ol_txrx_vdev_t *vdev) */ if (tx_msdu) { adf_nbuf_unmap(vdev->pdev->osdev, tx_msdu, ADF_OS_DMA_TO_DEVICE); - adf_nbuf_tx_free(tx_msdu, 1 /* error */); + adf_nbuf_tx_free(tx_msdu, ADF_NBUF_PKT_ERROR); } } } @@ -397,7 +397,7 @@ ol_tx_pdev_ll_pause_queue_send_all(struct ol_txrx_pdev_t *pdev) */ if (tx_msdu) { adf_nbuf_unmap(pdev->osdev, tx_msdu, ADF_OS_DMA_TO_DEVICE); - adf_nbuf_tx_free(tx_msdu, 1 /* error */); + adf_nbuf_tx_free(tx_msdu, ADF_NBUF_PKT_ERROR); } } /*check if there are more msdus to transmit*/ diff --git a/CORE/CLD_TXRX/TXRX/ol_tx_queue.c b/CORE/CLD_TXRX/TXRX/ol_tx_queue.c index fb065afe02e9..280287afe92a 100644 --- a/CORE/CLD_TXRX/TXRX/ol_tx_queue.c +++ b/CORE/CLD_TXRX/TXRX/ol_tx_queue.c @@ -1163,7 +1163,7 @@ ol_txrx_vdev_flush(ol_txrx_vdev_handle vdev) adf_nbuf_set_next(vdev->ll_pause.txq.head, NULL); adf_nbuf_unmap(vdev->pdev->osdev, vdev->ll_pause.txq.head, ADF_OS_DMA_TO_DEVICE); - adf_nbuf_tx_free(vdev->ll_pause.txq.head, 1 /* error */); + adf_nbuf_tx_free(vdev->ll_pause.txq.head, ADF_NBUF_PKT_ERROR); vdev->ll_pause.txq.head = next; } vdev->ll_pause.txq.tail = NULL; diff --git a/CORE/CLD_TXRX/TXRX/ol_txrx.c b/CORE/CLD_TXRX/TXRX/ol_txrx.c index 53bef249d472..64002ec6ed49 100644 --- a/CORE/CLD_TXRX/TXRX/ol_txrx.c +++ b/CORE/CLD_TXRX/TXRX/ol_txrx.c @@ -1222,7 +1222,7 @@ ol_txrx_vdev_detach( adf_nbuf_set_next(vdev->ll_pause.txq.head, NULL); adf_nbuf_unmap(pdev->osdev, vdev->ll_pause.txq.head, ADF_OS_DMA_TO_DEVICE); - adf_nbuf_tx_free(vdev->ll_pause.txq.head, 1 /* error */); + adf_nbuf_tx_free(vdev->ll_pause.txq.head, ADF_NBUF_PKT_ERROR); vdev->ll_pause.txq.head = next; } adf_os_spin_unlock_bh(&vdev->ll_pause.mutex); diff --git a/CORE/EPPING/src/epping_tx.c b/CORE/EPPING/src/epping_tx.c index 6d4e838325b6..12f1b4dfcf4e 100644 --- a/CORE/EPPING/src/epping_tx.c +++ b/CORE/EPPING/src/epping_tx.c @@ -404,7 +404,7 @@ void epping_tx_complete_multiple(void *ctx, pktSkb = adf_nbuf_queue_remove(&skb_queue); if (pktSkb == NULL) break; - adf_nbuf_free(pktSkb); + adf_nbuf_tx_free(pktSkb, ADF_NBUF_PKT_ERROR); pEpping_ctx->total_tx_acks++; } |
