---

yaml --- r: 266143 b: refs/heads/master c: f0d06d8 h: refs/heads/master i: 266141: df004b9 266139: 7232490 266135: 86c417c 266127: 62c60e4 266111: a76b342 v: v3
git-mirror · Sep 22, 2011 · 60a6e3d · 60a6e3d
1 parent c2aedc9
commit 60a6e3d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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;