---

yaml --- r: 265710 b: refs/heads/master c: 787343a h: refs/heads/master v: v3
git-mirror · Sep 15, 2011 · d5b5673 · d5b5673
1 parent 48e6e28
commit d5b5673
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f327358ab2cdfa534b2dc89e9dd2266c0f61f587
+refs/heads/master: 787343ad3d321fc987e36715433050df88353465
diff --git a/trunk/drivers/net/ethernet/micrel/ksz884x.c b/trunk/drivers/net/ethernet/micrel/ksz884x.c
@@ -4704,8 +4704,7 @@ static void send_packet(struct sk_buff *skb, struct net_device *dev)
 
 			dma_buf->dma = pci_map_single(
 				hw_priv->pdev,
-				page_address(this_frag->page) +
-				this_frag->page_offset,
+				skb_frag_address(this_frag),
 				dma_buf->len,
 				PCI_DMA_TODEVICE);
 			set_tx_buf(desc, dma_buf->dma);