diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2007-10-04 17:43:42 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:54:36 -0400 |
commit | 451bc0473f010babeadd888ae8ec1015959fd1b2 (patch) | |
tree | 19aa37b414f2879556bfa376aac277b9cd547a63 | |
parent | 5e28599a6e45eb8ce7e50510b06c3a34ebf1a8fa (diff) |
[DCCP]: Tidy-up -- minisock initialisation
This
* removes a declaration of a non-existent function
__dccp_minisock_init;
* shifts the initialisation function dccp_minisock_init() from
options.c to minisocks.c, where it is more naturally expected to
be.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/linux/dccp.h | 1 | ||||
-rw-r--r-- | net/dccp/minisocks.c | 10 | ||||
-rw-r--r-- | net/dccp/options.c | 10 |
3 files changed, 10 insertions, 11 deletions
diff --git a/include/linux/dccp.h b/include/linux/dccp.h index 0e44a3e5208d..f3fc4392e93d 100644 --- a/include/linux/dccp.h +++ b/include/linux/dccp.h | |||
@@ -391,7 +391,6 @@ struct dccp_opt_pend { | |||
391 | struct dccp_opt_conf *dccpop_sc; | 391 | struct dccp_opt_conf *dccpop_sc; |
392 | }; | 392 | }; |
393 | 393 | ||
394 | extern void __dccp_minisock_init(struct dccp_minisock *dmsk); | ||
395 | extern void dccp_minisock_init(struct dccp_minisock *dmsk); | 394 | extern void dccp_minisock_init(struct dccp_minisock *dmsk); |
396 | 395 | ||
397 | extern int dccp_parse_options(struct sock *sk, struct sk_buff *skb); | 396 | extern int dccp_parse_options(struct sock *sk, struct sk_buff *skb); |
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c index 91685990d57e..831b76e08d02 100644 --- a/net/dccp/minisocks.c +++ b/net/dccp/minisocks.c | |||
@@ -42,6 +42,16 @@ struct inet_timewait_death_row dccp_death_row = { | |||
42 | 42 | ||
43 | EXPORT_SYMBOL_GPL(dccp_death_row); | 43 | EXPORT_SYMBOL_GPL(dccp_death_row); |
44 | 44 | ||
45 | void dccp_minisock_init(struct dccp_minisock *dmsk) | ||
46 | { | ||
47 | dmsk->dccpms_sequence_window = sysctl_dccp_feat_sequence_window; | ||
48 | dmsk->dccpms_rx_ccid = sysctl_dccp_feat_rx_ccid; | ||
49 | dmsk->dccpms_tx_ccid = sysctl_dccp_feat_tx_ccid; | ||
50 | dmsk->dccpms_ack_ratio = sysctl_dccp_feat_ack_ratio; | ||
51 | dmsk->dccpms_send_ack_vector = sysctl_dccp_feat_send_ack_vector; | ||
52 | dmsk->dccpms_send_ndp_count = sysctl_dccp_feat_send_ndp_count; | ||
53 | } | ||
54 | |||
45 | void dccp_time_wait(struct sock *sk, int state, int timeo) | 55 | void dccp_time_wait(struct sock *sk, int state, int timeo) |
46 | { | 56 | { |
47 | struct inet_timewait_sock *tw = NULL; | 57 | struct inet_timewait_sock *tw = NULL; |
diff --git a/net/dccp/options.c b/net/dccp/options.c index a57fcbd7d03c..172eb6ba8702 100644 --- a/net/dccp/options.c +++ b/net/dccp/options.c | |||
@@ -29,16 +29,6 @@ int sysctl_dccp_feat_ack_ratio = DCCPF_INITIAL_ACK_RATIO; | |||
29 | int sysctl_dccp_feat_send_ack_vector = DCCPF_INITIAL_SEND_ACK_VECTOR; | 29 | int sysctl_dccp_feat_send_ack_vector = DCCPF_INITIAL_SEND_ACK_VECTOR; |
30 | int sysctl_dccp_feat_send_ndp_count = DCCPF_INITIAL_SEND_NDP_COUNT; | 30 | int sysctl_dccp_feat_send_ndp_count = DCCPF_INITIAL_SEND_NDP_COUNT; |
31 | 31 | ||
32 | void dccp_minisock_init(struct dccp_minisock *dmsk) | ||
33 | { | ||
34 | dmsk->dccpms_sequence_window = sysctl_dccp_feat_sequence_window; | ||
35 | dmsk->dccpms_rx_ccid = sysctl_dccp_feat_rx_ccid; | ||
36 | dmsk->dccpms_tx_ccid = sysctl_dccp_feat_tx_ccid; | ||
37 | dmsk->dccpms_ack_ratio = sysctl_dccp_feat_ack_ratio; | ||
38 | dmsk->dccpms_send_ack_vector = sysctl_dccp_feat_send_ack_vector; | ||
39 | dmsk->dccpms_send_ndp_count = sysctl_dccp_feat_send_ndp_count; | ||
40 | } | ||
41 | |||
42 | static u32 dccp_decode_value_var(const unsigned char *bf, const u8 len) | 32 | static u32 dccp_decode_value_var(const unsigned char *bf, const u8 len) |
43 | { | 33 | { |
44 | u32 value = 0; | 34 | u32 value = 0; |