diff options
| author | Roland Dreier <rolandd@cisco.com> | 2010-03-02 02:51:54 -0500 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2010-03-02 02:51:54 -0500 |
| commit | e8094e667aa89a7c455da1da9daf8a5ed063da8d (patch) | |
| tree | fc10a7b7db6d13db5e0ecf9b0b92e849b7b8a7db /include/rdma | |
| parent | 17a55f79fd8051a6a8a6e84176c83af71877a98b (diff) | |
| parent | cf4f7e8c47b3298cf90239bad5d86fdcad0c89eb (diff) | |
Merge branch 'cma' into for-next
Diffstat (limited to 'include/rdma')
| -rw-r--r-- | include/rdma/rdma_cm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h index c6b2962315b3..4fae90304648 100644 --- a/include/rdma/rdma_cm.h +++ b/include/rdma/rdma_cm.h | |||
| @@ -67,7 +67,6 @@ enum rdma_port_space { | |||
| 67 | RDMA_PS_IPOIB = 0x0002, | 67 | RDMA_PS_IPOIB = 0x0002, |
| 68 | RDMA_PS_TCP = 0x0106, | 68 | RDMA_PS_TCP = 0x0106, |
| 69 | RDMA_PS_UDP = 0x0111, | 69 | RDMA_PS_UDP = 0x0111, |
| 70 | RDMA_PS_SCTP = 0x0183 | ||
| 71 | }; | 70 | }; |
| 72 | 71 | ||
| 73 | struct rdma_addr { | 72 | struct rdma_addr { |