git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
[pandora-kernel.git]
/
drivers
/
infiniband
/
hw
/
cxgb3
/
cxio_wr.h
diff --git
a/drivers/infiniband/hw/cxgb3/cxio_wr.h
b/drivers/infiniband/hw/cxgb3/cxio_wr.h
index
15073b2
..
e5ddb63
100644
(file)
--- a/
drivers/infiniband/hw/cxgb3/cxio_wr.h
+++ b/
drivers/infiniband/hw/cxgb3/cxio_wr.h
@@
-691,7
+691,7
@@
struct t3_swrq {
struct t3_wq {
union t3_wr *queue; /* DMA accessable memory */
dma_addr_t dma_addr; /* DMA address for HW */
struct t3_wq {
union t3_wr *queue; /* DMA accessable memory */
dma_addr_t dma_addr; /* DMA address for HW */
- DE
CLARE_PCI_UNMAP_ADDR(mapping)
/* unmap kruft */
+ DE
FINE_DMA_UNMAP_ADDR(mapping);
/* unmap kruft */
u32 error; /* 1 once we go to ERROR */
u32 qpid;
u32 wptr; /* idx to next available WR slot */
u32 error; /* 1 once we go to ERROR */
u32 qpid;
u32 wptr; /* idx to next available WR slot */
@@
-718,7
+718,7
@@
struct t3_cq {
u32 wptr;
u32 size_log2;
dma_addr_t dma_addr;
u32 wptr;
u32 size_log2;
dma_addr_t dma_addr;
- DE
CLARE_PCI_UNMAP_ADDR(mapping)
+ DE
FINE_DMA_UNMAP_ADDR(mapping);
struct t3_cqe *queue;
struct t3_cqe *sw_queue;
u32 sw_rptr;
struct t3_cqe *queue;
struct t3_cqe *sw_queue;
u32 sw_rptr;