2 files changed, 6 insertions, 4 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 39913a065f99..67a477be237e 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -169,7 +169,7 @@ static struct sk_buff *ipoib_cm_alloc_rx_skb(struct net_device *dev,
                         goto partial_error;
                 skb_fill_page_desc(skb, i, page, 0, PAGE_SIZE);
 
-                mapping[i + 1] = ib_dma_map_page(priv->ca, skb_shinfo(skb)->frags[i].page,
+                mapping[i + 1] = ib_dma_map_page(priv->ca, page,
                                                  0, PAGE_SIZE, DMA_FROM_DEVICE);
                 if (unlikely(ib_dma_mapping_error(priv->ca, mapping[i + 1])))
                         goto partial_error;
@@ -537,7 +537,8 @@ static void skb_put_frags(struct sk_buff *skb, unsigned int hdr_space,
 
                 if (length == 0) {
                         /* don't need this page */
-                        skb_fill_page_desc(toskb, i, frag->page, 0, PAGE_SIZE);
+                        skb_fill_page_desc(toskb, i, skb_frag_page(frag),
+                                           0, PAGE_SIZE);
                         --skb_shinfo(skb)->nr_frags;
                 } else {
                         size = min(length, (unsigned) PAGE_SIZE);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 81ae61d68a22..00435be4a44b 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -182,7 +182,7 @@ static struct sk_buff *ipoib_alloc_rx_skb(struct net_device *dev, int id)
                         goto partial_error;
                 skb_fill_page_desc(skb, 0, page, 0, PAGE_SIZE);
                 mapping[1] =
-                        ib_dma_map_page(priv->ca, skb_shinfo(skb)->frags[0].page,
+                        ib_dma_map_page(priv->ca, page,
                                         0, PAGE_SIZE, DMA_FROM_DEVICE);
                 if (unlikely(ib_dma_mapping_error(priv->ca, mapping[1])))
                         goto partial_error;
@@ -323,7 +323,8 @@ static int ipoib_dma_map_tx(struct ib_device *ca,
 
         for (i = 0; i < skb_shinfo(skb)->nr_frags; ++i) {
                 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-                mapping[i + off] = ib_dma_map_page(ca, frag->page,
+                mapping[i + off] = ib_dma_map_page(ca,
+                                                 skb_frag_page(frag),
                                                  frag->page_offset, frag->size,
                                                  DMA_TO_DEVICE);
                 if (unlikely(ib_dma_mapping_error(ca, mapping[i + off])))