diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
| commit | 919251758195919ae3568021bc221e4f8c4b20eb (patch) | |
| tree | 81137a037ff8e6c91cc8de72d568275605c653c5 /include/rdma/ib_user_verbs.h | |
| parent | c394f1eafef61c6666f5876afde6110a276c4c9f (diff) | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
Merge branch 'mainline' into upstream-linus
Diffstat (limited to 'include/rdma/ib_user_verbs.h')
| -rw-r--r-- | include/rdma/ib_user_verbs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/rdma/ib_user_verbs.h b/include/rdma/ib_user_verbs.h index 7b5372010f4b..db1b814b62cc 100644 --- a/include/rdma/ib_user_verbs.h +++ b/include/rdma/ib_user_verbs.h | |||
| @@ -275,6 +275,8 @@ struct ib_uverbs_resize_cq { | |||
| 275 | 275 | ||
| 276 | struct ib_uverbs_resize_cq_resp { | 276 | struct ib_uverbs_resize_cq_resp { |
| 277 | __u32 cqe; | 277 | __u32 cqe; |
| 278 | __u32 reserved; | ||
| 279 | __u64 driver_data[0]; | ||
| 278 | }; | 280 | }; |
| 279 | 281 | ||
| 280 | struct ib_uverbs_poll_cq { | 282 | struct ib_uverbs_poll_cq { |