Merge by Hand

[linux-2.6] / include / linux / dccp.h

diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 13f9b78483fc3ded5464719f3f089b1e39205ebd..71fab4311e92624ff985793df2d9c14777b7e46c 100644 (file)
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -179,6 +179,8 @@ enum {
 /* DCCP socket options */
 #define DCCP_SOCKOPT_PACKET_SIZE       1
 #define DCCP_SOCKOPT_SERVICE           2
+#define DCCP_SOCKOPT_CCID_RX_INFO      128
+#define DCCP_SOCKOPT_CCID_TX_INFO      192
 
 #define DCCP_SERVICE_LIST_MAX_LEN      32