dccp: Kill dead code and add static markers. (1f4f0f64) · Commits · e / devices / android_kernel_fairphone_FP3

net/dccp/dccp.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -246,7 +246,6 @@ static inline void dccp_clear_xmit_timers(struct sock *sk)
	extern unsigned int dccp_sync_mss(struct sock *sk, u32 pmtu);		extern unsigned int dccp_sync_mss(struct sock *sk, u32 pmtu);

	extern const char *dccp_packet_name(const int type);		extern const char *dccp_packet_name(const int type);
	extern const char *dccp_state_name(const int state);

	extern void dccp_set_state(struct sock *sk, const int state);		extern void dccp_set_state(struct sock *sk, const int state);
	extern void dccp_done(struct sock *sk);		extern void dccp_done(struct sock *sk);
	@@ -449,7 +448,6 @@ extern int dccp_insert_options_rsk(struct dccp_request_sock, struct sk_buff);
	extern int dccp_insert_option_elapsed_time(struct sk_buff *skb, u32 elapsed);		extern int dccp_insert_option_elapsed_time(struct sk_buff *skb, u32 elapsed);
	extern u32 dccp_timestamp(void);		extern u32 dccp_timestamp(void);
	extern void dccp_timestamping_init(void);		extern void dccp_timestamping_init(void);
	extern int dccp_insert_option_timestamp(struct sk_buff *skb);
	extern int dccp_insert_option(struct sk_buff *skb, unsigned char option,		extern int dccp_insert_option(struct sk_buff *skb, unsigned char option,
	const void *value, unsigned char len);		const void *value, unsigned char len);

net/dccp/feat.c

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -730,16 +730,6 @@ int dccp_feat_register_sp(struct sock *sk, u8 feat, u8 is_local,
	0, list, len);		0, list, len);
	}		}

	/* Analogous to dccp_feat_register_sp(), but for non-negotiable values */
	int dccp_feat_register_nn(struct sock *sk, u8 feat, u64 val)
	{
	/* any changes must be registered before establishing the connection */
	if (sk->sk_state != DCCP_CLOSED)
	return -EISCONN;
	if (dccp_feat_type(feat) != FEAT_NN)
	return -EINVAL;
	return __feat_register_nn(&dccp_sk(sk)->dccps_featneg, feat, 0, val);
	}

	/*		/*
	* Tracking features whose value depend on the choice of CCID		* Tracking features whose value depend on the choice of CCID

net/dccp/feat.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -111,7 +111,6 @@ extern int dccp_feat_init(struct sock *sk);
	extern void dccp_feat_initialise_sysctls(void);		extern void dccp_feat_initialise_sysctls(void);
	extern int dccp_feat_register_sp(struct sock *sk, u8 feat, u8 is_local,		extern int dccp_feat_register_sp(struct sock *sk, u8 feat, u8 is_local,
	u8 const *list, u8 len);		u8 const *list, u8 len);
	extern int dccp_feat_register_nn(struct sock *sk, u8 feat, u64 val);
	extern int dccp_feat_parse_options(struct sock , struct dccp_request_sock ,		extern int dccp_feat_parse_options(struct sock , struct dccp_request_sock ,
	u8 mand, u8 opt, u8 feat, u8 *val, u8 len);		u8 mand, u8 opt, u8 feat, u8 *val, u8 len);
	extern int dccp_feat_clone_list(struct list_head const , struct list_head );		extern int dccp_feat_clone_list(struct list_head const , struct list_head );

net/dccp/options.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -369,7 +369,7 @@ int dccp_insert_option_elapsed_time(struct sk_buff *skb, u32 elapsed_time)

	EXPORT_SYMBOL_GPL(dccp_insert_option_elapsed_time);		EXPORT_SYMBOL_GPL(dccp_insert_option_elapsed_time);

	int dccp_insert_option_timestamp(struct sk_buff *skb)		static int dccp_insert_option_timestamp(struct sk_buff *skb)
	{		{
	__be32 now = htonl(dccp_timestamp());		__be32 now = htonl(dccp_timestamp());
	/* yes this will overflow but that is the point as we want a		/* yes this will overflow but that is the point as we want a
	@@ -378,8 +378,6 @@ int dccp_insert_option_timestamp(struct sk_buff *skb)
	return dccp_insert_option(skb, DCCPO_TIMESTAMP, &now, sizeof(now));		return dccp_insert_option(skb, DCCPO_TIMESTAMP, &now, sizeof(now));
	}		}

	EXPORT_SYMBOL_GPL(dccp_insert_option_timestamp);

	static int dccp_insert_option_timestamp_echo(struct dccp_sock *dp,		static int dccp_insert_option_timestamp_echo(struct dccp_sock *dp,
	struct dccp_request_sock *dreq,		struct dccp_request_sock *dreq,
	struct sk_buff *skb)		struct sk_buff *skb)

net/dccp/proto.c

+24 −24

Original line number	Original line	Diff line number	Diff line
	@@ -50,6 +50,30 @@ EXPORT_SYMBOL_GPL(dccp_hashinfo);
	/* the maximum queue length for tx in packets. 0 is no limit */		/* the maximum queue length for tx in packets. 0 is no limit */
	int sysctl_dccp_tx_qlen __read_mostly = 5;		int sysctl_dccp_tx_qlen __read_mostly = 5;

			#ifdef CONFIG_IP_DCCP_DEBUG
			static const char *dccp_state_name(const int state)
			{
			static const char *const dccp_state_names[] = {
			[DCCP_OPEN] = "OPEN",
			[DCCP_REQUESTING] = "REQUESTING",
			[DCCP_PARTOPEN] = "PARTOPEN",
			[DCCP_LISTEN] = "LISTEN",
			[DCCP_RESPOND] = "RESPOND",
			[DCCP_CLOSING] = "CLOSING",
			[DCCP_ACTIVE_CLOSEREQ] = "CLOSEREQ",
			[DCCP_PASSIVE_CLOSE] = "PASSIVE_CLOSE",
			[DCCP_PASSIVE_CLOSEREQ] = "PASSIVE_CLOSEREQ",
			[DCCP_TIME_WAIT] = "TIME_WAIT",
			[DCCP_CLOSED] = "CLOSED",
			};

			if (state >= DCCP_MAX_STATES)
			return "INVALID STATE!";
			else
			return dccp_state_names[state];
			}
			#endif

	void dccp_set_state(struct sock *sk, const int state)		void dccp_set_state(struct sock *sk, const int state)
	{		{
	const int oldstate = sk->sk_state;		const int oldstate = sk->sk_state;
	@@ -146,30 +170,6 @@ const char *dccp_packet_name(const int type)

	EXPORT_SYMBOL_GPL(dccp_packet_name);		EXPORT_SYMBOL_GPL(dccp_packet_name);

	const char *dccp_state_name(const int state)
	{
	static const char *const dccp_state_names[] = {
	[DCCP_OPEN] = "OPEN",
	[DCCP_REQUESTING] = "REQUESTING",
	[DCCP_PARTOPEN] = "PARTOPEN",
	[DCCP_LISTEN] = "LISTEN",
	[DCCP_RESPOND] = "RESPOND",
	[DCCP_CLOSING] = "CLOSING",
	[DCCP_ACTIVE_CLOSEREQ] = "CLOSEREQ",
	[DCCP_PASSIVE_CLOSE] = "PASSIVE_CLOSE",
	[DCCP_PASSIVE_CLOSEREQ] = "PASSIVE_CLOSEREQ",
	[DCCP_TIME_WAIT] = "TIME_WAIT",
	[DCCP_CLOSED] = "CLOSED",
	};

	if (state >= DCCP_MAX_STATES)
	return "INVALID STATE!";
	else
	return dccp_state_names[state];
	}

	EXPORT_SYMBOL_GPL(dccp_state_name);

	int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized)		int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized)
	{		{
	struct dccp_sock *dp = dccp_sk(sk);		struct dccp_sock *dp = dccp_sk(sk);