From d5b567325ea5d8ad43db86b774d8299f900be5d7 Mon Sep 17 00:00:00 2001
From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Wed, 31 Aug 2011 00:46:55 +0000
Subject: [PATCH] --- yaml --- r: 265710 b: refs/heads/master c:
 787343ad3d321fc987e36715433050df88353465 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/ethernet/micrel/ksz884x.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b6d0925106a3..075b82c120f9 100644
--- 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
index 27418d31a09f..710c4aead146 100644
--- 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);