Commit e2370f07 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller

ravb: do not invalidate cache for RX buffer twice

First, dma_sync_single_for_cpu() shouldn't have been called in the first place
(it's a streaming DMA API), dma_unmap_single() should have been called instead.
Second, dma_unmap_single() call after handing the buffer to napi_gro_receive()
makes little sense.  Moreover desc->dptr might not be valid at this point.
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 15afb10d
...@@ -543,10 +543,9 @@ static bool ravb_rx(struct net_device *ndev, int *quota, int q) ...@@ -543,10 +543,9 @@ static bool ravb_rx(struct net_device *ndev, int *quota, int q)
skb = priv->rx_skb[q][entry]; skb = priv->rx_skb[q][entry];
priv->rx_skb[q][entry] = NULL; priv->rx_skb[q][entry] = NULL;
dma_sync_single_for_cpu(&ndev->dev, dma_unmap_single(&ndev->dev, le32_to_cpu(desc->dptr),
le32_to_cpu(desc->dptr), ALIGN(PKT_BUF_SZ, 16),
ALIGN(PKT_BUF_SZ, 16), DMA_FROM_DEVICE);
DMA_FROM_DEVICE);
get_ts &= (q == RAVB_NC) ? get_ts &= (q == RAVB_NC) ?
RAVB_RXTSTAMP_TYPE_V2_L2_EVENT : RAVB_RXTSTAMP_TYPE_V2_L2_EVENT :
~RAVB_RXTSTAMP_TYPE_V2_L2_EVENT; ~RAVB_RXTSTAMP_TYPE_V2_L2_EVENT;
...@@ -584,9 +583,6 @@ static bool ravb_rx(struct net_device *ndev, int *quota, int q) ...@@ -584,9 +583,6 @@ static bool ravb_rx(struct net_device *ndev, int *quota, int q)
if (!skb) if (!skb)
break; /* Better luck next round. */ break; /* Better luck next round. */
ravb_set_buffer_align(skb); ravb_set_buffer_align(skb);
dma_unmap_single(&ndev->dev, le32_to_cpu(desc->dptr),
ALIGN(PKT_BUF_SZ, 16),
DMA_FROM_DEVICE);
dma_addr = dma_map_single(&ndev->dev, skb->data, dma_addr = dma_map_single(&ndev->dev, skb->data,
le16_to_cpu(desc->ds_cc), le16_to_cpu(desc->ds_cc),
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment