diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /include/rdma/rdma_user_cm.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'include/rdma/rdma_user_cm.h')
| -rw-r--r-- | include/rdma/rdma_user_cm.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/rdma/rdma_user_cm.h b/include/rdma/rdma_user_cm.h index c55705460b87..1d165022c02d 100644 --- a/include/rdma/rdma_user_cm.h +++ b/include/rdma/rdma_user_cm.h | |||
| @@ -215,12 +215,14 @@ struct rdma_ucm_event_resp { | |||
| 215 | 215 | ||
| 216 | /* Option levels */ | 216 | /* Option levels */ |
| 217 | enum { | 217 | enum { |
| 218 | RDMA_OPTION_ID = 0 | 218 | RDMA_OPTION_ID = 0, |
| 219 | RDMA_OPTION_IB = 1 | ||
| 219 | }; | 220 | }; |
| 220 | 221 | ||
| 221 | /* Option details */ | 222 | /* Option details */ |
| 222 | enum { | 223 | enum { |
| 223 | RDMA_OPTION_ID_TOS = 0 | 224 | RDMA_OPTION_ID_TOS = 0, |
| 225 | RDMA_OPTION_IB_PATH = 1 | ||
| 224 | }; | 226 | }; |
| 225 | 227 | ||
| 226 | struct rdma_ucm_set_option { | 228 | struct rdma_ucm_set_option { |