From ea134638fdf2c43a7ec9b1ba274db69ac78245b0 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 10 Oct 2011 01:11:40 +0000 Subject: [PATCH] --- yaml --- r: 266485 b: refs/heads/master c: 3ed6f6958c0ac21958285d8648f14d34da4bbcb3 h: refs/heads/master i: 266483: 48abc947fe4abac564c82a76d6d0212e5eded463 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/xilinx/ll_temac_main.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8519644e986e..04b0c13cbeb6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8f114c26452059e03fb970141e5795e08015217 +refs/heads/master: 3ed6f6958c0ac21958285d8648f14d34da4bbcb3 diff --git a/trunk/drivers/net/ethernet/xilinx/ll_temac_main.c b/trunk/drivers/net/ethernet/xilinx/ll_temac_main.c index 570776edc01b..66e3c36c3733 100644 --- a/trunk/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/trunk/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -715,8 +715,7 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) cur_p = &lp->tx_bd_v[lp->tx_bd_tail]; cur_p->phys = dma_map_single(ndev->dev.parent, - (void *)page_address(frag->page) + - frag->page_offset, + skb_frag_address(frag), frag->size, DMA_TO_DEVICE); cur_p->len = frag->size; cur_p->app0 = 0;