diff options
author | Dotan Barak <dotanb@dev.mellanox.co.il> | 2011-10-18 09:22:14 -0400 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2011-10-18 13:08:31 -0400 |
commit | 787adb9d6ad9afb498a1580a7d8ad05f779c488a (patch) | |
tree | 9ab5e25a27fac6b66b1af0c903f3f9cb4517a69c /drivers/infiniband/ulp | |
parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) |
IPoIB: Use the right function to do DMA unmap pages
Pages that were mapped using ib_dma_map_page() should be unmapped
using ib_dma_unmap_page().
Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
Reviewed-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/ulp')
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c index 39913a065f99..483b098f41fe 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c | |||
@@ -84,7 +84,7 @@ static void ipoib_cm_dma_unmap_rx(struct ipoib_dev_priv *priv, int frags, | |||
84 | ib_dma_unmap_single(priv->ca, mapping[0], IPOIB_CM_HEAD_SIZE, DMA_FROM_DEVICE); | 84 | ib_dma_unmap_single(priv->ca, mapping[0], IPOIB_CM_HEAD_SIZE, DMA_FROM_DEVICE); |
85 | 85 | ||
86 | for (i = 0; i < frags; ++i) | 86 | for (i = 0; i < frags; ++i) |
87 | ib_dma_unmap_single(priv->ca, mapping[i + 1], PAGE_SIZE, DMA_FROM_DEVICE); | 87 | ib_dma_unmap_page(priv->ca, mapping[i + 1], PAGE_SIZE, DMA_FROM_DEVICE); |
88 | } | 88 | } |
89 | 89 | ||
90 | static int ipoib_cm_post_receive_srq(struct net_device *dev, int id) | 90 | static int ipoib_cm_post_receive_srq(struct net_device *dev, int id) |
@@ -183,7 +183,7 @@ partial_error: | |||
183 | ib_dma_unmap_single(priv->ca, mapping[0], IPOIB_CM_HEAD_SIZE, DMA_FROM_DEVICE); | 183 | ib_dma_unmap_single(priv->ca, mapping[0], IPOIB_CM_HEAD_SIZE, DMA_FROM_DEVICE); |
184 | 184 | ||
185 | for (; i > 0; --i) | 185 | for (; i > 0; --i) |
186 | ib_dma_unmap_single(priv->ca, mapping[i], PAGE_SIZE, DMA_FROM_DEVICE); | 186 | ib_dma_unmap_page(priv->ca, mapping[i], PAGE_SIZE, DMA_FROM_DEVICE); |
187 | 187 | ||
188 | dev_kfree_skb_any(skb); | 188 | dev_kfree_skb_any(skb); |
189 | return NULL; | 189 | return NULL; |