From 60a6e3df2e6d9775d1dd154183ab2fbb49c59d3e Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 21 Sep 2011 21:53:15 +0000 Subject: [PATCH] --- yaml --- r: 266143 b: refs/heads/master c: f0d06d82f7ab821554f8761aaa47c3ad592cc441 h: refs/heads/master i: 266141: df004b9122784f927dee02712637e15dd61ba902 266139: 7232490b53c6ecca427973f4303b8f4335ec292c 266135: 86c417c4997367e3ee5f244bb37d247b1dec263a 266127: 62c60e49f59f77f5513d465c69eeadb3eadf513f 266111: a76b342847cf316ec0334607d603fb805f212792 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/neterion/s2io.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9293e77ba1d5..9506ba646093 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8decf868790b48a727d7e7ca164f2bcd3c1389c0 +refs/heads/master: f0d06d82f7ab821554f8761aaa47c3ad592cc441 diff --git a/trunk/drivers/net/ethernet/neterion/s2io.c b/trunk/drivers/net/ethernet/neterion/s2io.c index 840cbb25bdde..ef5b825a9a9c 100644 --- a/trunk/drivers/net/ethernet/neterion/s2io.c +++ b/trunk/drivers/net/ethernet/neterion/s2io.c @@ -4190,10 +4190,10 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev) if (!frag->size) continue; txdp++; - txdp->Buffer_Pointer = (u64)pci_map_page(sp->pdev, frag->page, - frag->page_offset, - frag->size, - PCI_DMA_TODEVICE); + txdp->Buffer_Pointer = (u64)skb_frag_dma_map(&sp->pdev->dev, + frag, 0, + frag->size, + PCI_DMA_TODEVICE); txdp->Control_1 = TXD_BUFFER0_SIZE(frag->size); if (offload_type == SKB_GSO_UDP) txdp->Control_1 |= TXD_UFO_EN;