diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
| commit | 28eb177dfa5982d132edceed891cb3885df258bb (patch) | |
| tree | 5f8fdc37ad1d8d0793e9c47da7d908b97c814ffb /include/rdma/ib_user_verbs.h | |
| parent | fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b (diff) | |
| parent | db392219c5f572610645696e3672f6ea38783a65 (diff) | |
Merge branch 'master' into upstream
Conflicts:
net/ieee80211/ieee80211_crypt_tkip.c
net/ieee80211/ieee80211_crypt_wep.c
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 { |