mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 06:03:36 -04:00
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>
This commit is contained in:
commit
0c7d375711
22 changed files with 243 additions and 405 deletions
|
|
@ -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];
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue