]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: ll_temac: remove virt_to_bus call
authorJohn Linn <john.linn@xilinx.com>
Thu, 8 Apr 2010 07:08:01 +0000 (07:08 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Apr 2010 08:33:43 +0000 (01:33 -0700)
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>
drivers/net/ll_temac_main.c

index 72cb8c107157a8a6b2e43e7774a446105c39a8a2..67765756577dfbe2c6698de99e73bcfefff1f8f5 100644 (file)
@@ -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);