Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / net / rds / ib_send.c

diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c
index 09c46f2e97fad8f7139348b5f8c2ec1ad526968a..18f2341202f8dd70931f7878cddba4c5aefe08c8 100644 (file)
--- a/net/rds/ib_send.c
+++ b/net/rds/ib_send.c
@@ -646,16 +646,16 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm,
                if (i < work_alloc
                    && scat != &rm->data.op_sg[rm->data.op_count]) {
                        len = min(RDS_FRAG_SIZE,
-                               ib_sg_dma_len(dev, scat) - rm->data.op_dmaoff);
+                                 sg_dma_len(scat) - rm->data.op_dmaoff);
                        send->s_wr.num_sge = 2;
 
-                       send->s_sge[1].addr = ib_sg_dma_address(dev, scat);
+                       send->s_sge[1].addr = sg_dma_address(scat);
                        send->s_sge[1].addr += rm->data.op_dmaoff;
                        send->s_sge[1].length = len;
 
                        bytes_sent += len;
                        rm->data.op_dmaoff += len;
-                       if (rm->data.op_dmaoff == ib_sg_dma_len(dev, scat)) {
+                       if (rm->data.op_dmaoff == sg_dma_len(scat)) {
                                scat++;
                                rm->data.op_dmasg++;
                                rm->data.op_dmaoff = 0;
@@ -809,8 +809,8 @@ int rds_ib_xmit_atomic(struct rds_connection *conn, struct rm_atomic_op *op)
        }
 
        /* Convert our struct scatterlist to struct ib_sge */
-       send->s_sge[0].addr = ib_sg_dma_address(ic->i_cm_id->device, op->op_sg);
-       send->s_sge[0].length = ib_sg_dma_len(ic->i_cm_id->device, op->op_sg);
+       send->s_sge[0].addr = sg_dma_address(op->op_sg);
+       send->s_sge[0].length = sg_dma_len(op->op_sg);
        send->s_sge[0].lkey = ic->i_pd->local_dma_lkey;
 
        rdsdebug("rva %Lx rpa %Lx len %u\n", op->op_remote_addr,
@@ -922,9 +922,8 @@ int rds_ib_xmit_rdma(struct rds_connection *conn, struct rm_rdma_op *op)
 
                for (j = 0; j < send->s_rdma_wr.wr.num_sge &&
                     scat != &op->op_sg[op->op_count]; j++) {
-                       len = ib_sg_dma_len(ic->i_cm_id->device, scat);
-                       send->s_sge[j].addr =
-                                ib_sg_dma_address(ic->i_cm_id->device, scat);
+                       len = sg_dma_len(scat);
+                       send->s_sge[j].addr = sg_dma_address(scat);
                        send->s_sge[j].length = len;
                        send->s_sge[j].lkey = ic->i_pd->local_dma_lkey;