| commit | e8094e667aa89a7c455da1da9daf8a5ed063da8d | [log] [tgz] |
|---|---|---|
| author | Roland Dreier <rolandd@cisco.com> | Mon Mar 01 23:51:54 2010 -0800 |
| committer | Roland Dreier <rolandd@cisco.com> | Mon Mar 01 23:51:54 2010 -0800 |
| tree | fc10a7b7db6d13db5e0ecf9b0b92e849b7b8a7db | |
| parent | 17a55f79fd8051a6a8a6e84176c83af71877a98b [diff] | |
| parent | cf4f7e8c47b3298cf90239bad5d86fdcad0c89eb [diff] |
Merge branch 'cma' into for-next
diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h index c6b2962..4fae903 100644 --- a/include/rdma/rdma_cm.h +++ b/include/rdma/rdma_cm.h
@@ -67,7 +67,6 @@ RDMA_PS_IPOIB = 0x0002, RDMA_PS_TCP = 0x0106, RDMA_PS_UDP = 0x0111, - RDMA_PS_SCTP = 0x0183 }; struct rdma_addr {