[02/11] IB/core: allow passing mapping an offset into the SG in ib_map_mr_sg

Commit Message

Christoph Hellwig May 8, 2016, 8:08 a.m. UTC

i40iw grew MR support since the last version, so we'll need the fixup
below as well.  Doug, what's your plan for the series?  Should I repost
with this folded?  It would be really great to get this in before the
merge window ends in a week..

---
From c1bbcbeabf333cbf8ac5739af69b05998576b721 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <[e-mail]>
Date: Sun, 8 May 2016 10:05:12 +0200
Subject: IB/i40iw: pass through MR offset

Signed-off-by: Christoph Hellwig <[e-mail]>
---
 drivers/infiniband/hw/i40iw/i40iw_verbs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
index eaa79c9..141eaba 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
@@ -1573,12 +1573,13 @@  static int i40iw_set_page(struct ib_mr *ibmr, u64 addr)
  * @sg: scatter gather list for fmr
  * @sg_nents: number of sg pages
  */
-static int i40iw_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents)
+static int i40iw_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg,
+		int sg_nents, unsigned int sg_offset)
 {
 	struct i40iw_mr *iwmr = to_iwmr(ibmr);
 
 	iwmr->npages = 0;
-	return ib_sg_to_pages(ibmr, sg, sg_nents, i40iw_set_page);
+	return ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, i40iw_set_page);
 }
 
 /**