From e3f291f586cac5171b1b2031368211e31eaa1c23 Mon Sep 17 00:00:00 2001 From: "Marciniszyn, Mike" Date: Fri, 21 Dec 2012 08:01:49 +0000 Subject: [PATCH] --- yaml --- r: 348027 b: refs/heads/master c: f2e9bd70327d788011cf787a51ceba5925bbc63a h: refs/heads/master i: 348025: de54af8f5209de49e377c1195d527c1a1fb7275f 348023: 35d9d35347666026958768ce0113cd251460f905 v: v3 --- [refs] | 2 +- trunk/net/rds/ib_recv.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e4b47edbb30b..8adc6d056b88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af9b078e354614fad1e2e0cef04e216ae37cc389 +refs/heads/master: f2e9bd70327d788011cf787a51ceba5925bbc63a diff --git a/trunk/net/rds/ib_recv.c b/trunk/net/rds/ib_recv.c index 8c5bc857f04d..8eb9501e3d60 100644 --- a/trunk/net/rds/ib_recv.c +++ b/trunk/net/rds/ib_recv.c @@ -339,8 +339,8 @@ static int rds_ib_recv_refill_one(struct rds_connection *conn, sge->length = sizeof(struct rds_header); sge = &recv->r_sge[1]; - sge->addr = sg_dma_address(&recv->r_frag->f_sg); - sge->length = sg_dma_len(&recv->r_frag->f_sg); + sge->addr = ib_sg_dma_address(ic->i_cm_id->device, &recv->r_frag->f_sg); + sge->length = ib_sg_dma_len(ic->i_cm_id->device, &recv->r_frag->f_sg); ret = 0; out: @@ -381,7 +381,10 @@ void rds_ib_recv_refill(struct rds_connection *conn, int prefill) ret = ib_post_recv(ic->i_cm_id->qp, &recv->r_wr, &failed_wr); rdsdebug("recv %p ibinc %p page %p addr %lu ret %d\n", recv, recv->r_ibinc, sg_page(&recv->r_frag->f_sg), - (long) sg_dma_address(&recv->r_frag->f_sg), ret); + (long) ib_sg_dma_address( + ic->i_cm_id->device, + &recv->r_frag->f_sg), + ret); if (ret) { rds_ib_conn_error(conn, "recv post on " "%pI4 returned %d, disconnecting and "