aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x/bnx2x.h
diff options
context:
space:
mode:
authorVladislav Zolotarov <vladz@broadcom.com>2010-12-07 20:43:17 -0500
committerDavid S. Miller <davem@davemloft.net>2010-12-09 23:50:01 -0500
commitd245a1111251d77c804e9fe362e9f70aba856e1e (patch)
tree8d5f3398eca999356e83319b4090b7289dad0104 /drivers/net/bnx2x/bnx2x.h
parent2297a2da5a8507bf6596dc30ace3483c00bd85ed (diff)
bnx2x: Use dma_alloc_coherent() semantics for ILT memory allocation
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x.h')
-rw-r--r--drivers/net/bnx2x/bnx2x.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index cfc25cf064d3..abbdf6d5b84e 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -1336,7 +1336,7 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
1336 1336
1337#define BNX2X_ILT_ZALLOC(x, y, size) \ 1337#define BNX2X_ILT_ZALLOC(x, y, size) \
1338 do { \ 1338 do { \
1339 x = pci_alloc_consistent(bp->pdev, size, y); \ 1339 x = dma_alloc_coherent(&bp->pdev->dev, size, y, GFP_KERNEL); \
1340 if (x) \ 1340 if (x) \
1341 memset(x, 0, size); \ 1341 memset(x, 0, size); \
1342 } while (0) 1342 } while (0)
@@ -1344,7 +1344,7 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
1344#define BNX2X_ILT_FREE(x, y, size) \ 1344#define BNX2X_ILT_FREE(x, y, size) \
1345 do { \ 1345 do { \
1346 if (x) { \ 1346 if (x) { \
1347 pci_free_consistent(bp->pdev, size, x, y); \ 1347 dma_free_coherent(&bp->pdev->dev, size, x, y); \
1348 x = NULL; \ 1348 x = NULL; \
1349 y = 0; \ 1349 y = 0; \
1350 } \ 1350 } \