aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan McDonald <ian.mcdonald@jandi.co.nz>2006-08-26 22:15:35 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 18:18:16 -0400
commit2a0109a707d2b0ae48f124d3be0fdf1715c0107a (patch)
tree52d6335e8e50c0573fd455730ae2b0d99d36bf82
parentef047f5e1085d6393748d1ee27d6327905f098dc (diff)
[DCCP]: Shift sysctls into feat.h
This shifts further sysctls into feat.h. No change in functionality - shifting code only. Signed off by: Ian McDonald <ian.mcdonald@jandi.co.nz> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/dccp/feat.h5
-rw-r--r--net/dccp/sysctl.c8
2 files changed, 6 insertions, 7 deletions
diff --git a/net/dccp/feat.h b/net/dccp/feat.h
index b44c45504fb6..cee553d416ca 100644
--- a/net/dccp/feat.h
+++ b/net/dccp/feat.h
@@ -27,5 +27,10 @@ extern int dccp_feat_clone(struct sock *oldsk, struct sock *newsk);
27extern int dccp_feat_init(struct dccp_minisock *dmsk); 27extern int dccp_feat_init(struct dccp_minisock *dmsk);
28 28
29extern int dccp_feat_default_sequence_window; 29extern int dccp_feat_default_sequence_window;
30extern int dccp_feat_default_rx_ccid;
31extern int dccp_feat_default_tx_ccid;
32extern int dccp_feat_default_ack_ratio;
33extern int dccp_feat_default_send_ack_vector;
34extern int dccp_feat_default_send_ndp_count;
30 35
31#endif /* _DCCP_FEAT_H */ 36#endif /* _DCCP_FEAT_H */
diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c
index c1ba9451bc3d..38bc157876f3 100644
--- a/net/dccp/sysctl.c
+++ b/net/dccp/sysctl.c
@@ -11,18 +11,12 @@
11 11
12#include <linux/mm.h> 12#include <linux/mm.h>
13#include <linux/sysctl.h> 13#include <linux/sysctl.h>
14#include "feat.h"
14 15
15#ifndef CONFIG_SYSCTL 16#ifndef CONFIG_SYSCTL
16#error This file should not be compiled without CONFIG_SYSCTL defined 17#error This file should not be compiled without CONFIG_SYSCTL defined
17#endif 18#endif
18 19
19extern int dccp_feat_default_sequence_window;
20extern int dccp_feat_default_rx_ccid;
21extern int dccp_feat_default_tx_ccid;
22extern int dccp_feat_default_ack_ratio;
23extern int dccp_feat_default_send_ack_vector;
24extern int dccp_feat_default_send_ndp_count;
25
26static struct ctl_table dccp_default_table[] = { 20static struct ctl_table dccp_default_table[] = {
27 { 21 {
28 .ctl_name = NET_DCCP_DEFAULT_SEQ_WINDOW, 22 .ctl_name = NET_DCCP_DEFAULT_SEQ_WINDOW,