diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /include/rdma/ib_user_verbs.h | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'include/rdma/ib_user_verbs.h')
| -rw-r--r-- | include/rdma/ib_user_verbs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rdma/ib_user_verbs.h b/include/rdma/ib_user_verbs.h index db1b814b62cc..64a721fcbc1c 100644 --- a/include/rdma/ib_user_verbs.h +++ b/include/rdma/ib_user_verbs.h | |||
| @@ -458,7 +458,7 @@ struct ib_uverbs_query_qp_resp { | |||
| 458 | __u8 cur_qp_state; | 458 | __u8 cur_qp_state; |
| 459 | __u8 path_mtu; | 459 | __u8 path_mtu; |
| 460 | __u8 path_mig_state; | 460 | __u8 path_mig_state; |
| 461 | __u8 en_sqd_async_notify; | 461 | __u8 sq_draining; |
| 462 | __u8 max_rd_atomic; | 462 | __u8 max_rd_atomic; |
| 463 | __u8 max_dest_rd_atomic; | 463 | __u8 max_dest_rd_atomic; |
| 464 | __u8 min_rnr_timer; | 464 | __u8 min_rnr_timer; |