浏览代码

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>
John Linn 15 年之前
父节点
当前提交
33646d7ff5
共有 1 个文件被更改,包括 1 次插入3 次删除
  1. 1 3
      drivers/net/ll_temac_main.c

+ 1 - 3
drivers/net/ll_temac_main.c

@@ -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)
 		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, skb_vaddr, length,
+		dma_unmap_single(ndev->dev.parent, cur_p->phys, length,
 				 DMA_FROM_DEVICE);
 				 DMA_FROM_DEVICE);
 
 
 		skb_put(skb, length);
 		skb_put(skb, length);