diff options
author | James Morris <jmorris@namei.org> | 2011-11-16 01:39:48 (GMT) |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-11-16 01:39:48 (GMT) |
commit | 24942c8e5cc8696064ee207ff29d4cf21f70dafc (patch) | |
tree | 08a8221eb72ec3da7746d7d76f6f5915ce77cde7 /include/rdma/iw_cm.h | |
parent | e163bc8e4a0cd1cdffadb58253f7651201722d56 (diff) | |
parent | ff0ff78068dd8a962358dbbdafa9d6f24540d3e5 (diff) | |
download | linux-fsl-qoriq-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.xz |
Merge branch 'master'; commit 'v3.2-rc2' into next
Diffstat (limited to 'include/rdma/iw_cm.h')
-rw-r--r-- | include/rdma/iw_cm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h index 2d0191c..1a046b1 100644 --- a/include/rdma/iw_cm.h +++ b/include/rdma/iw_cm.h @@ -52,8 +52,10 @@ struct iw_cm_event { struct sockaddr_in local_addr; struct sockaddr_in remote_addr; void *private_data; - u8 private_data_len; void *provider_data; + u8 private_data_len; + u8 ord; + u8 ird; }; /** |