Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 451bc047 authored Oct 04, 2007 by Gerrit Renker Committed by David S. Miller Oct 10, 2007

[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>

parent 5e28599a

include/linux/dccp.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -391,7 +391,6 @@ struct dccp_opt_pend {
	struct dccp_opt_conf *dccpop_sc;		struct dccp_opt_conf *dccpop_sc;
	};		};

	extern void __dccp_minisock_init(struct dccp_minisock *dmsk);
	extern void dccp_minisock_init(struct dccp_minisock *dmsk);		extern void dccp_minisock_init(struct dccp_minisock *dmsk);

	extern int dccp_parse_options(struct sock sk, struct sk_buff skb);		extern int dccp_parse_options(struct sock sk, struct sk_buff skb);

net/dccp/minisocks.c

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,16 @@ struct inet_timewait_death_row dccp_death_row = {

	EXPORT_SYMBOL_GPL(dccp_death_row);		EXPORT_SYMBOL_GPL(dccp_death_row);

			void dccp_minisock_init(struct dccp_minisock *dmsk)
			{
			dmsk->dccpms_sequence_window = sysctl_dccp_feat_sequence_window;
			dmsk->dccpms_rx_ccid = sysctl_dccp_feat_rx_ccid;
			dmsk->dccpms_tx_ccid = sysctl_dccp_feat_tx_ccid;
			dmsk->dccpms_ack_ratio = sysctl_dccp_feat_ack_ratio;
			dmsk->dccpms_send_ack_vector = sysctl_dccp_feat_send_ack_vector;
			dmsk->dccpms_send_ndp_count = sysctl_dccp_feat_send_ndp_count;
			}

	void dccp_time_wait(struct sock *sk, int state, int timeo)		void dccp_time_wait(struct sock *sk, int state, int timeo)
	{		{
	struct inet_timewait_sock *tw = NULL;		struct inet_timewait_sock *tw = NULL;

net/dccp/options.c

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -29,16 +29,6 @@ int sysctl_dccp_feat_ack_ratio = DCCPF_INITIAL_ACK_RATIO;
	int sysctl_dccp_feat_send_ack_vector = DCCPF_INITIAL_SEND_ACK_VECTOR;		int sysctl_dccp_feat_send_ack_vector = DCCPF_INITIAL_SEND_ACK_VECTOR;
	int sysctl_dccp_feat_send_ndp_count = DCCPF_INITIAL_SEND_NDP_COUNT;		int sysctl_dccp_feat_send_ndp_count = DCCPF_INITIAL_SEND_NDP_COUNT;

	void dccp_minisock_init(struct dccp_minisock *dmsk)
	{
	dmsk->dccpms_sequence_window = sysctl_dccp_feat_sequence_window;
	dmsk->dccpms_rx_ccid = sysctl_dccp_feat_rx_ccid;
	dmsk->dccpms_tx_ccid = sysctl_dccp_feat_tx_ccid;
	dmsk->dccpms_ack_ratio = sysctl_dccp_feat_ack_ratio;
	dmsk->dccpms_send_ack_vector = sysctl_dccp_feat_send_ack_vector;
	dmsk->dccpms_send_ndp_count = sysctl_dccp_feat_send_ndp_count;
	}

	static u32 dccp_decode_value_var(const unsigned char *bf, const u8 len)		static u32 dccp_decode_value_var(const unsigned char *bf, const u8 len)
	{		{
	u32 value = 0;		u32 value = 0;