From c4e0ae1d455484ef4d680e599b77efb4a5ad9838 Mon Sep 17 00:00:00 2001 From: Ian McDonald Date: Sat, 26 Aug 2006 19:15:35 -0700 Subject: [PATCH] --- yaml --- r: 34634 b: refs/heads/master c: 2a0109a707d2b0ae48f124d3be0fdf1715c0107a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/dccp/feat.h | 5 +++++ trunk/net/dccp/sysctl.c | 8 +------- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 95ed0a9dc314..5d9ba7d22f07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef047f5e1085d6393748d1ee27d6327905f098dc +refs/heads/master: 2a0109a707d2b0ae48f124d3be0fdf1715c0107a diff --git a/trunk/net/dccp/feat.h b/trunk/net/dccp/feat.h index b44c45504fb6..cee553d416ca 100644 --- a/trunk/net/dccp/feat.h +++ b/trunk/net/dccp/feat.h @@ -27,5 +27,10 @@ extern int dccp_feat_clone(struct sock *oldsk, struct sock *newsk); extern int dccp_feat_init(struct dccp_minisock *dmsk); extern int dccp_feat_default_sequence_window; +extern int dccp_feat_default_rx_ccid; +extern int dccp_feat_default_tx_ccid; +extern int dccp_feat_default_ack_ratio; +extern int dccp_feat_default_send_ack_vector; +extern int dccp_feat_default_send_ndp_count; #endif /* _DCCP_FEAT_H */ diff --git a/trunk/net/dccp/sysctl.c b/trunk/net/dccp/sysctl.c index c1ba9451bc3d..38bc157876f3 100644 --- a/trunk/net/dccp/sysctl.c +++ b/trunk/net/dccp/sysctl.c @@ -11,18 +11,12 @@ #include #include +#include "feat.h" #ifndef CONFIG_SYSCTL #error This file should not be compiled without CONFIG_SYSCTL defined #endif -extern int dccp_feat_default_sequence_window; -extern int dccp_feat_default_rx_ccid; -extern int dccp_feat_default_tx_ccid; -extern int dccp_feat_default_ack_ratio; -extern int dccp_feat_default_send_ack_vector; -extern int dccp_feat_default_send_ndp_count; - static struct ctl_table dccp_default_table[] = { { .ctl_name = NET_DCCP_DEFAULT_SEQ_WINDOW,