lkml.org 
[lkml]   [2019]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/20] dpaa_eth: cleanup skb_to_contig_fd()
    Date
    Remove cast, align variable name, simplify DMA map size computation.

    Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
    ---
    drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
    index c178f1b8c5e5..78651bb45cfe 100644
    --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
    +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
    @@ -1382,7 +1382,7 @@ static void count_ern(struct dpaa_percpu_priv *percpu_priv,
    static int dpaa_enable_tx_csum(struct dpaa_priv *priv,
    struct sk_buff *skb,
    struct qm_fd *fd,
    - char *parse_results)
    + void *parse_results)
    {
    struct fman_prs_result *parse_result;
    u16 ethertype = ntohs(skb->protocol);
    @@ -1836,7 +1836,7 @@ static int skb_to_contig_fd(struct dpaa_priv *priv,
    {
    struct net_device *net_dev = priv->net_dev;
    enum dma_data_direction dma_dir;
    - unsigned char *buffer_start;
    + unsigned char *buff_start;
    struct sk_buff **skbh;
    dma_addr_t addr;
    int err;
    @@ -1845,10 +1845,10 @@ static int skb_to_contig_fd(struct dpaa_priv *priv,
    * available, so just use that for offset.
    */
    fd->bpid = FSL_DPAA_BPID_INV;
    - buffer_start = skb->data - priv->tx_headroom;
    + buff_start = skb->data - priv->tx_headroom;
    dma_dir = DMA_TO_DEVICE;

    - skbh = (struct sk_buff **)buffer_start;
    + skbh = (struct sk_buff **)buff_start;
    *skbh = skb;

    /* Enable L3/L4 hardware checksum computation.
    @@ -1857,7 +1857,7 @@ static int skb_to_contig_fd(struct dpaa_priv *priv,
    * need to write into the skb.
    */
    err = dpaa_enable_tx_csum(priv, skb, fd,
    - ((char *)skbh) + DPAA_TX_PRIV_DATA_SIZE);
    + buff_start + DPAA_TX_PRIV_DATA_SIZE);
    if (unlikely(err < 0)) {
    if (net_ratelimit())
    netif_err(priv, tx_err, net_dev, "HW csum error: %d\n",
    @@ -1870,8 +1870,8 @@ static int skb_to_contig_fd(struct dpaa_priv *priv,
    fd->cmd |= cpu_to_be32(FM_FD_CMD_FCO);

    /* Map the entire buffer size that may be seen by FMan, but no more */
    - addr = dma_map_single(priv->tx_dma_dev, skbh,
    - skb_tail_pointer(skb) - buffer_start, dma_dir);
    + addr = dma_map_single(priv->tx_dma_dev, buff_start,
    + priv->tx_headroom + skb->len, dma_dir);
    if (unlikely(dma_mapping_error(priv->tx_dma_dev, addr))) {
    if (net_ratelimit())
    netif_err(priv, tx_err, net_dev, "dma_map_single() failed\n");
    --
    2.1.0
    \
     
     \ /
      Last update: 2019-10-08 14:12    [W:2.431 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site