Commit 33646d7f authored by John Linn's avatar John Linn Committed by David S. Miller

net: ll_temac: remove virt_to_bus call

The virt_to_bus call should not be used any longer as it's
considered illegal. The driver has the physical address of
the buffer in the descriptor such that it's not necessary
anyway.
Signed-off-by: default avatarJohn Linn <john.linn@xilinx.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ed85b565
...@@ -612,7 +612,6 @@ static void ll_temac_recv(struct net_device *ndev) ...@@ -612,7 +612,6 @@ static void ll_temac_recv(struct net_device *ndev)
struct cdmac_bd *cur_p; struct cdmac_bd *cur_p;
dma_addr_t tail_p; dma_addr_t tail_p;
int length; int length;
unsigned long skb_vaddr;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&lp->rx_lock, flags); spin_lock_irqsave(&lp->rx_lock, flags);
...@@ -626,8 +625,7 @@ static void ll_temac_recv(struct net_device *ndev) ...@@ -626,8 +625,7 @@ static void ll_temac_recv(struct net_device *ndev)
skb = lp->rx_skb[lp->rx_bd_ci]; skb = lp->rx_skb[lp->rx_bd_ci];
length = cur_p->app4 & 0x3FFF; length = cur_p->app4 & 0x3FFF;
skb_vaddr = virt_to_bus(skb->data); dma_unmap_single(ndev->dev.parent, cur_p->phys, length,
dma_unmap_single(ndev->dev.parent, skb_vaddr, length,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
skb_put(skb, length); skb_put(skb, length);
......
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