Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[deliverable/linux.git] / net / rds / ib.h

diff --git a/net/rds/ib.h b/net/rds/ib.h
index 333611d9e07d0460f6a0c99a6e22358f798022c4..86d88ec5d5563538472b9ece4a99c7f751dfe0d1 100644 (file)
--- a/net/rds/ib.h
+++ b/net/rds/ib.h
@@ -235,28 +235,34 @@ extern struct workqueue_struct *rds_ib_wq;
  * doesn't define it.
  */
 static inline void rds_ib_dma_sync_sg_for_cpu(struct ib_device *dev,
-               struct scatterlist *sg, unsigned int sg_dma_len, int direction)
+                                             struct scatterlist *sglist,
+                                             unsigned int sg_dma_len,
+                                             int direction)
 {
+       struct scatterlist *sg;
        unsigned int i;
 
-       for (i = 0; i < sg_dma_len; ++i) {
+       for_each_sg(sglist, sg, sg_dma_len, i) {
                ib_dma_sync_single_for_cpu(dev,
-                               ib_sg_dma_address(dev, &sg[i]),
-                               ib_sg_dma_len(dev, &sg[i]),
+                               ib_sg_dma_address(dev, sg),
+                               ib_sg_dma_len(dev, sg),
                                direction);
        }
 }
 #define ib_dma_sync_sg_for_cpu rds_ib_dma_sync_sg_for_cpu
 
 static inline void rds_ib_dma_sync_sg_for_device(struct ib_device *dev,
-               struct scatterlist *sg, unsigned int sg_dma_len, int direction)
+                                                struct scatterlist *sglist,
+                                                unsigned int sg_dma_len,
+                                                int direction)
 {
+       struct scatterlist *sg;
        unsigned int i;
 
-       for (i = 0; i < sg_dma_len; ++i) {
+       for_each_sg(sglist, sg, sg_dma_len, i) {
                ib_dma_sync_single_for_device(dev,
-                               ib_sg_dma_address(dev, &sg[i]),
-                               ib_sg_dma_len(dev, &sg[i]),
+                               ib_sg_dma_address(dev, sg),
+                               ib_sg_dma_len(dev, sg),
                                direction);
        }
 }