Merge branch 'sg_nents' into rdma.git for-next

[platform/kernel/linux-rpi.git] / drivers / infiniband / sw / rxe / rxe_mr.c

diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
index b5fcb14..5890a82 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_mr.c
+++ b/drivers/infiniband/sw/rxe/rxe_mr.c
@@ -123,7 +123,6 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,
                goto err_out;
        }
 
-       mr->umem = umem;
        num_buf = ib_umem_num_pages(umem);
 
        rxe_mr_init(access, mr);
@@ -286,11 +285,10 @@ out:
 }
 
 /* copy data from a range (vaddr, vaddr+length-1) to or from
- * a mr object starting at iova. Compute incremental value of
- * crc32 if crcp is not zero. caller must hold a reference to mr
+ * a mr object starting at iova.
  */
 int rxe_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, int length,
-               enum rxe_mr_copy_dir dir, u32 *crcp)
+               enum rxe_mr_copy_dir dir)
 {
        int                     err;
        int                     bytes;
@@ -300,7 +298,6 @@ int rxe_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, int length,
        int                     m;
        int                     i;
        size_t                  offset;
-       u32                     crc = crcp ? (*crcp) : 0;
 
        if (length == 0)
                return 0;
@@ -314,10 +311,6 @@ int rxe_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, int length,
 
                memcpy(dest, src, length);
 
-               if (crcp)
-                       *crcp = rxe_crc32(to_rdev(mr->ibmr.device), *crcp, dest,
-                                         length);
-
                return 0;
        }
 
@@ -348,10 +341,6 @@ int rxe_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, int length,
 
                memcpy(dest, src, bytes);
 
-               if (crcp)
-                       crc = rxe_crc32(to_rdev(mr->ibmr.device), crc, dest,
-                                       bytes);
-
                length  -= bytes;
                addr    += bytes;
 
@@ -366,9 +355,6 @@ int rxe_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, int length,
                }
        }
 
-       if (crcp)
-               *crcp = crc;
-
        return 0;
 
 err1:
@@ -384,8 +370,7 @@ int copy_data(
        struct rxe_dma_info     *dma,
        void                    *addr,
        int                     length,
-       enum rxe_mr_copy_dir    dir,
-       u32                     *crcp)
+       enum rxe_mr_copy_dir    dir)
 {
        int                     bytes;
        struct rxe_sge          *sge    = &dma->sge[dma->cur_sge];
@@ -446,7 +431,7 @@ int copy_data(
                if (bytes > 0) {
                        iova = sge->addr + offset;
 
-                       err = rxe_mr_copy(mr, iova, addr, bytes, dir, crcp);
+                       err = rxe_mr_copy(mr, iova, addr, bytes, dir);
                        if (err)
                                goto err2;