diff options
| author | John Linn <john.linn@xilinx.com> | 2010-04-08 07:08:01 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 01:33:43 -0700 |
| commit | 33646d7ff5f47225cbbf3a06597ded649bf34e8d (patch) | |
| tree | 16d9cb268da8457ba3bc4ce52e052789149b9d53 /drivers/net/ll_temac_main.c | |
| parent | ed85b565b825566da34e55eee9ad150ed93fdda0 (diff) | |
| download | op-kernel-dev-33646d7ff5f47225cbbf3a06597ded649bf34e8d.zip op-kernel-dev-33646d7ff5f47225cbbf3a06597ded649bf34e8d.tar.gz | |
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.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index 72cb8c1..6776575 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) struct cdmac_bd *cur_p; dma_addr_t tail_p; int length; - unsigned long skb_vaddr; unsigned long flags; spin_lock_irqsave(&lp->rx_lock, flags); @@ -626,8 +625,7 @@ static void ll_temac_recv(struct net_device *ndev) skb = lp->rx_skb[lp->rx_bd_ci]; length = cur_p->app4 & 0x3FFF; - skb_vaddr = virt_to_bus(skb->data); - dma_unmap_single(ndev->dev.parent, skb_vaddr, length, + dma_unmap_single(ndev->dev.parent, cur_p->phys, length, DMA_FROM_DEVICE); skb_put(skb, length); |
