aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/feat.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp/feat.c')
-rw-r--r--net/dccp/feat.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/net/dccp/feat.c b/net/dccp/feat.c
index 7303f79705d2..12006e9b2472 100644
--- a/net/dccp/feat.c
+++ b/net/dccp/feat.c
@@ -25,6 +25,11 @@
25#include "ccid.h" 25#include "ccid.h"
26#include "feat.h" 26#include "feat.h"
27 27
28/* feature-specific sysctls - initialised to the defaults from RFC 4340, 6.4 */
29unsigned long sysctl_dccp_sequence_window __read_mostly = 100;
30int sysctl_dccp_rx_ccid __read_mostly = 2,
31 sysctl_dccp_tx_ccid __read_mostly = 2;
32
28/* 33/*
29 * Feature activation handlers. 34 * Feature activation handlers.
30 * 35 *
@@ -1146,7 +1151,7 @@ int dccp_feat_init(struct sock *sk)
1146 1151
1147 /* Non-negotiable (NN) features */ 1152 /* Non-negotiable (NN) features */
1148 rc = __feat_register_nn(fn, DCCPF_SEQUENCE_WINDOW, 0, 1153 rc = __feat_register_nn(fn, DCCPF_SEQUENCE_WINDOW, 0,
1149 sysctl_dccp_feat_sequence_window); 1154 sysctl_dccp_sequence_window);
1150 if (rc) 1155 if (rc)
1151 return rc; 1156 return rc;
1152 1157
@@ -1172,8 +1177,8 @@ int dccp_feat_init(struct sock *sk)
1172 ccid_get_builtin_ccids(&rx.val, &rx.len)) 1177 ccid_get_builtin_ccids(&rx.val, &rx.len))
1173 return -ENOBUFS; 1178 return -ENOBUFS;
1174 1179
1175 if (!dccp_feat_prefer(sysctl_dccp_feat_tx_ccid, tx.val, tx.len) || 1180 if (!dccp_feat_prefer(sysctl_dccp_tx_ccid, tx.val, tx.len) ||
1176 !dccp_feat_prefer(sysctl_dccp_feat_rx_ccid, rx.val, rx.len)) 1181 !dccp_feat_prefer(sysctl_dccp_rx_ccid, rx.val, rx.len))
1177 goto free_ccid_lists; 1182 goto free_ccid_lists;
1178 1183
1179 rc = __feat_register_sp(fn, DCCPF_CCID, true, false, tx.val, tx.len); 1184 rc = __feat_register_sp(fn, DCCPF_CCID, true, false, tx.val, tx.len);