From 55fd1db0a4bd74f961e617d3e4c7e3bcd2f064bd Mon Sep 17 00:00:00 2001 From: John Linn Date: Thu, 8 Apr 2010 07:08:01 +0000 Subject: [PATCH] --- yaml --- r: 194017 b: refs/heads/master c: 33646d7ff5f47225cbbf3a06597ded649bf34e8d h: refs/heads/master i: 194015: 480f7c20171ae70edc3938b6747a446e63e845ee v: v3 --- [refs] | 2 +- trunk/drivers/net/ll_temac_main.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fcd42e7fc8f3..d7d89f888b91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed85b565b825566da34e55eee9ad150ed93fdda0 +refs/heads/master: 33646d7ff5f47225cbbf3a06597ded649bf34e8d diff --git a/trunk/drivers/net/ll_temac_main.c b/trunk/drivers/net/ll_temac_main.c index 72cb8c107157..67765756577d 100644 --- a/trunk/drivers/net/ll_temac_main.c +++ b/trunk/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);