diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-07 01:55:33 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-07 01:55:33 +0300 |
| commit | 0c7d3757116c59b3eedd9aa6dfd7ae0a1341f5c2 (patch) | |
| tree | 61dbcee09d925a839b34df3b8149e26972dc5402 /include | |
| parent | 2442d3109943bafbdfc4f0495e3d10eeedc8390c (diff) | |
| parent | b45bfcc1ae084aa98c0350b8c33c8b57540b0acc (diff) | |
| download | linux-0c7d3757116c59b3eedd9aa6dfd7ae0a1341f5c2.tar.xz | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IB/ehca: Remove obsolete prototypes
IB/ehca: Remove use of do_mmap()
RDMA/addr: Handle ethernet neighbour updates during route resolution
IB: Make sure struct ib_user_mad.data is aligned
IB/srp: Don't wait for response when QP is in error state.
IB: Return qp pointer as part of ib_wc
IB: Include <linux/kref.h> explicitly in <rdma/ib_verbs.h>
Diffstat (limited to 'include')
| -rw-r--r-- | include/rdma/ib_user_mad.h | 2 | ||||
| -rw-r--r-- | include/rdma/ib_verbs.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/rdma/ib_user_mad.h b/include/rdma/ib_user_mad.h index 44537aa32e62..d66b15ea82c4 100644 --- a/include/rdma/ib_user_mad.h +++ b/include/rdma/ib_user_mad.h @@ -98,7 +98,7 @@ struct ib_user_mad_hdr { */ struct ib_user_mad { struct ib_user_mad_hdr hdr; - __u8 data[0]; + __u64 data[0]; }; /** diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 0bfa3328d686..765589f4d166 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -45,6 +45,7 @@ #include <linux/device.h> #include <linux/mm.h> #include <linux/dma-mapping.h> +#include <linux/kref.h> #include <asm/atomic.h> #include <asm/scatterlist.h> @@ -419,8 +420,8 @@ struct ib_wc { enum ib_wc_opcode opcode; u32 vendor_err; u32 byte_len; + struct ib_qp *qp; __be32 imm_data; - u32 qp_num; u32 src_qp; int wc_flags; u16 pkey_index; |