---

yaml --- r: 265708 b: refs/heads/master c: 8838a53 h: refs/heads/master v: v3
git-mirror · Sep 15, 2011 · 5c6623c · 5c6623c
1 parent 5201e3c
commit 5c6623c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3857e3ee2209b7289c434103e366f765ec82a22d
+refs/heads/master: 8838a5381149ff69e23dc13de7c81b28ac688e2e
diff --git a/trunk/drivers/net/ethernet/ibm/ibmveth.c b/trunk/drivers/net/ethernet/ibm/ibmveth.c
@@ -1002,9 +1002,8 @@ static netdev_tx_t ibmveth_start_xmit(struct sk_buff *skb,
 		unsigned long dma_addr;
 		skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
-		dma_addr = dma_map_page(&adapter->vdev->dev, frag->page,
-					frag->page_offset, frag->size,
-					DMA_TO_DEVICE);
+		dma_addr = skb_frag_dma_map(&adapter->vdev->dev, frag, 0,
+					    frag->size, DMA_TO_DEVICE);
 
 		if (dma_mapping_error(&adapter->vdev->dev, dma_addr))
 			goto map_failed_frags;