From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 09/75] IPoIB: convert to SKB paged frag API. Date: Fri, 19 Aug 2011 14:26:41 +0100 Message-ID: <1313760467-8598-9-git-send-email-ian.campbell@citrix.com> References: <1313760393.5010.356.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: linux-kernel@vger.kernel.org, Ian Campbell , Roland Dreier , Sean Hefty , Hal Rosenstock , "David S. Miller" , Or Gerlitz , Joe Perches , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , Christoph Lameter , linux-rdma@vger.kernel.org To: netdev@vger.kernel.org Return-path: In-Reply-To: <1313760393.5010.356.camel@zakaz.uk.xensource.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Signed-off-by: Ian Campbell Cc: Roland Dreier Cc: Sean Hefty Cc: Hal Rosenstock Cc: "David S. Miller" Cc: Or Gerlitz Cc: Joe Perches Cc: "Micha=C5=82 Miros=C5=82aw" Cc: Christoph Lameter Cc: linux-rdma@vger.kernel.org --- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 5 +++-- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniba= nd/ulp/ipoib/ipoib_cm.c index 39913a0..67a477b 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); =20 - mapping[i + 1] =3D ib_dma_map_page(priv->ca, skb_shinfo(skb)->frags[= i].page, + mapping[i + 1] =3D 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, unsi= gned int hdr_space, =20 if (length =3D=3D 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 =3D min(length, (unsigned) PAGE_SIZE); diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniba= nd/ulp/ipoib/ipoib_ib.c index 81ae61d..00435be 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 ne= t_device *dev, int id) goto partial_error; skb_fill_page_desc(skb, 0, page, 0, PAGE_SIZE); mapping[1] =3D - 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, =20 for (i =3D 0; i < skb_shinfo(skb)->nr_frags; ++i) { skb_frag_t *frag =3D &skb_shinfo(skb)->frags[i]; - mapping[i + off] =3D ib_dma_map_page(ca, frag->page, + mapping[i + off] =3D 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]))) --=20 1.7.2.5