diff options
| author | Ioana Radulescu <ruxandra.radulescu@nxp.com> | 2018-03-23 08:44:11 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-23 16:01:57 +0100 |
| commit | b2718e6fd33aa0ea86a450704ba8c19032709927 (patch) | |
| tree | 90abda58d3ddf9d7fd3c5f13eaecc4e05560bf17 | |
| parent | e018f1fd99adcd8e467ac60796ea93f5d86d2afe (diff) | |
staging: fsl-dpaa2/eth: Cleanup TX frame freeing code
Cleanup code in free_tx_fd() that deals with S/G frames:
- remove local variables that aren't really needed
- in the frame sw annotation area, store the actual SG table
buffer size, which is needed on free, rather then recompute
it based on number of S/G entries
Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 17 | ||||
| -rw-r--r-- | drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 2 |
2 files changed, 6 insertions, 13 deletions
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c index f58c85a4a62e..9994922db68a 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c @@ -406,7 +406,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv, swa->skb = skb; swa->scl = scl; swa->num_sg = num_sg; - swa->num_dma_bufs = num_dma_bufs; + swa->sgt_size = sgt_buf_size; /* Separately map the SGT buffer */ addr = dma_map_single(dev, sgt_buf, sgt_buf_size, DMA_BIDIRECTIONAL); @@ -489,9 +489,6 @@ static void free_tx_fd(const struct dpaa2_eth_priv *priv, dma_addr_t fd_addr; struct sk_buff **skbh, *skb; unsigned char *buffer_start; - int unmap_size; - struct scatterlist *scl; - int num_sg, num_dma_bufs; struct dpaa2_eth_swa *swa; u8 fd_format = dpaa2_fd_get_format(fd); @@ -510,18 +507,14 @@ static void free_tx_fd(const struct dpaa2_eth_priv *priv, } else if (fd_format == dpaa2_fd_sg) { swa = (struct dpaa2_eth_swa *)skbh; skb = swa->skb; - scl = swa->scl; - num_sg = swa->num_sg; - num_dma_bufs = swa->num_dma_bufs; /* Unmap the scatterlist */ - dma_unmap_sg(dev, scl, num_sg, DMA_BIDIRECTIONAL); - kfree(scl); + dma_unmap_sg(dev, swa->scl, swa->num_sg, DMA_BIDIRECTIONAL); + kfree(swa->scl); /* Unmap the SGT buffer */ - unmap_size = priv->tx_data_offset + - sizeof(struct dpaa2_sg_entry) * (1 + num_dma_bufs); - dma_unmap_single(dev, fd_addr, unmap_size, DMA_BIDIRECTIONAL); + dma_unmap_single(dev, fd_addr, swa->sgt_size, + DMA_BIDIRECTIONAL); } else { netdev_dbg(priv->net_dev, "Invalid FD format\n"); return; diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h index 5ac014f5833a..fc9a25519ee6 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h @@ -108,7 +108,7 @@ struct dpaa2_eth_swa { struct sk_buff *skb; struct scatterlist *scl; int num_sg; - int num_dma_bufs; + int sgt_size; }; /* Annotation valid bits in FD FRC */ |