diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/rdma/ib_user_verbs.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/rdma/ib_user_verbs.h')
| -rw-r--r-- | include/rdma/ib_user_verbs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/rdma/ib_user_verbs.h b/include/rdma/ib_user_verbs.h index a17f77106149..fe5b05177a2c 100644 --- a/include/rdma/ib_user_verbs.h +++ b/include/rdma/ib_user_verbs.h | |||
| @@ -205,7 +205,8 @@ struct ib_uverbs_query_port_resp { | |||
| 205 | __u8 active_width; | 205 | __u8 active_width; |
| 206 | __u8 active_speed; | 206 | __u8 active_speed; |
| 207 | __u8 phys_state; | 207 | __u8 phys_state; |
| 208 | __u8 reserved[3]; | 208 | __u8 link_layer; |
| 209 | __u8 reserved[2]; | ||
| 209 | }; | 210 | }; |
| 210 | 211 | ||
| 211 | struct ib_uverbs_alloc_pd { | 212 | struct ib_uverbs_alloc_pd { |