summaryrefslogtreecommitdiff
path: root/include/rdma
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2010-03-01 23:51:54 -0800
committerRoland Dreier <rolandd@cisco.com>2010-03-01 23:51:54 -0800
commite8094e667aa89a7c455da1da9daf8a5ed063da8d (patch)
treefc10a7b7db6d13db5e0ecf9b0b92e849b7b8a7db /include/rdma
parent17a55f79fd8051a6a8a6e84176c83af71877a98b (diff)
parentcf4f7e8c47b3298cf90239bad5d86fdcad0c89eb (diff)
downloadlinux-3.10-e8094e667aa89a7c455da1da9daf8a5ed063da8d.tar.gz
linux-3.10-e8094e667aa89a7c455da1da9daf8a5ed063da8d.tar.bz2
linux-3.10-e8094e667aa89a7c455da1da9daf8a5ed063da8d.zip
Merge branch 'cma' into for-next
Diffstat (limited to 'include/rdma')
-rw-r--r--include/rdma/rdma_cm.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h
index c6b2962315b..4fae9030464 100644
--- a/include/rdma/rdma_cm.h
+++ b/include/rdma/rdma_cm.h
@@ -67,7 +67,6 @@ enum rdma_port_space {
RDMA_PS_IPOIB = 0x0002,
RDMA_PS_TCP = 0x0106,
RDMA_PS_UDP = 0x0111,
- RDMA_PS_SCTP = 0x0183
};
struct rdma_addr {