diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-10 15:37:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-10 15:37:47 -0700 |
| commit | 0e44dc383787b472a7f13564c6bd8a44cc07d408 (patch) | |
| tree | e7d49fa04f93dec589c1fa8ffb1b129b1b92a0f9 /drivers/infiniband/hw/mthca/mthca_dev.h | |
| parent | 6314410dd1e9db1c0009b0f7b56cc771a4d1e85a (diff) | |
| parent | ce477ae4f8c75c94587c3157deffad8219db09a0 (diff) | |
| download | kernel_samsung_aries-0e44dc383787b472a7f13564c6bd8a44cc07d408.zip kernel_samsung_aries-0e44dc383787b472a7f13564c6bd8a44cc07d408.tar.gz kernel_samsung_aries-0e44dc383787b472a7f13564c6bd8a44cc07d408.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/mthca: FMR ioremap fix
IPoIB: Free child interfaces properly
IB/mthca: Fix race in reference counting
IB/srp: Fix tracking of pending requests during error handling
IB: Fix display of 4-bit port counters in sysfs
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_dev.h')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_dev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h index 4c1dcb4..f8160b8 100644 --- a/drivers/infiniband/hw/mthca/mthca_dev.h +++ b/drivers/infiniband/hw/mthca/mthca_dev.h @@ -496,7 +496,7 @@ void mthca_free_cq(struct mthca_dev *dev, void mthca_cq_completion(struct mthca_dev *dev, u32 cqn); void mthca_cq_event(struct mthca_dev *dev, u32 cqn, enum ib_event_type event_type); -void mthca_cq_clean(struct mthca_dev *dev, u32 cqn, u32 qpn, +void mthca_cq_clean(struct mthca_dev *dev, struct mthca_cq *cq, u32 qpn, struct mthca_srq *srq); void mthca_cq_resize_copy_cqes(struct mthca_cq *cq); int mthca_alloc_cq_buf(struct mthca_dev *dev, struct mthca_cq_buf *buf, int nent); |