aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ll_temac_main.c
diff options
context:
space:
mode:
authorJohn Linn <john.linn@xilinx.com>2010-04-08 03:08:01 -0400
committerDavid S. Miller <davem@davemloft.net>2010-04-13 04:33:43 -0400
commit33646d7ff5f47225cbbf3a06597ded649bf34e8d (patch)
tree16d9cb268da8457ba3bc4ce52e052789149b9d53 /drivers/net/ll_temac_main.c
parented85b565b825566da34e55eee9ad150ed93fdda0 (diff)
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: John Linn <john.linn@xilinx.com> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ll_temac_main.c')
-rw-r--r--drivers/net/ll_temac_main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index 72cb8c107157..67765756577d 100644
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -612,7 +612,6 @@ static void ll_temac_recv(struct net_device *ndev)
612 struct cdmac_bd *cur_p; 612 struct cdmac_bd *cur_p;
613 dma_addr_t tail_p; 613 dma_addr_t tail_p;
614 int length; 614 int length;
615 unsigned long skb_vaddr;
616 unsigned long flags; 615 unsigned long flags;
617 616
618 spin_lock_irqsave(&lp->rx_lock, flags); 617 spin_lock_irqsave(&lp->rx_lock, flags);
@@ -626,8 +625,7 @@ static void ll_temac_recv(struct net_device *ndev)
626 skb = lp->rx_skb[lp->rx_bd_ci]; 625 skb = lp->rx_skb[lp->rx_bd_ci];
627 length = cur_p->app4 & 0x3FFF; 626 length = cur_p->app4 & 0x3FFF;
628 627
629 skb_vaddr = virt_to_bus(skb->data); 628 dma_unmap_single(ndev->dev.parent, cur_p->phys, length,
630 dma_unmap_single(ndev->dev.parent, skb_vaddr, length,
631 DMA_FROM_DEVICE); 629 DMA_FROM_DEVICE);
632 630
633 skb_put(skb, length); 631 skb_put(skb, length);