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 git://git.samba.org/sfrench/cifs-2.6
[pandora-kernel.git]
/
include
/
rdma
/
rdma_user_cm.h
diff --git
a/include/rdma/rdma_user_cm.h
b/include/rdma/rdma_user_cm.h
index
fc82c18
..
5348a00
100644
(file)
--- a/
include/rdma/rdma_user_cm.h
+++ b/
include/rdma/rdma_user_cm.h
@@
-77,7
+77,8
@@
struct rdma_ucm_create_id {
__u64 uid;
__u64 response;
__u16 ps;
- __u8 reserved[6];
+ __u8 qp_type;
+ __u8 reserved[5];
};
struct rdma_ucm_create_id_resp {