dccp:
Subsystems (2)
PATCH 1/1 dccp:
Remove dead code and make some functions static.
Compile tested only.
Signed-off-by Stephen Hemminger <[email protected]>
--- net/dccp/dccp.h | 2 -- net/dccp/feat.c | 10 ---------- net/dccp/feat.h | 1 - net/dccp/options.c | 4 +--- net/dccp/proto.c | 48 ++++++++++++++++++++++++------------------------ 5 files changed, 25 insertions(+), 40 deletions(-)
net/dccp/dccp.h +0 -2
@@ -246,7 +246,6 @@ static inline void dccp_clear_xmit_timerextern unsigned int dccp_sync_mss (struct sock *sk,u32 pmtu);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_done (struct sock *sk);
@@ -449,7 +448,6 @@ extern int dccp_insert_options_rsk(strucextern int dccp_insert_option_elapsed_time (struct sk_buff *skb,u32 elapsed);extern u32 dccp_timestamp (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,const void *value,unsigned char len);
net/dccp/feat.c +0 -10
@@ -730,16 +730,6 @@ int dccp_feat_register_sp(struct sock *s 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
net/dccp/options.c +1 -3
@@ -369,7 +369,7 @@ int dccp_insert_option_elapsed_time(struEXPORT_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 ());/* yes this will overflow but that is the point as we want a
@@ -378,8 +378,6 @@ int dccp_insert_option_timestamp(structreturn 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,struct dccp_request_sock *dreq,struct sk_buff *skb)
net/dccp/proto.c +24 -24
60 lines not on this page · raw message
net/dccp/feat.h +0 -1
@@ -111,7 +111,6 @@ extern int dccp_feat_init(struct sock *extern void dccp_feat_initialise_sysctls (void );extern int dccp_feat_register_sp (struct sock *sk,u8 feat,u8 is_local,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 *,u8 mand,u8 opt,u8 feat,u8 *val,u8 len);extern int dccp_feat_clone_list (struct list_head const *,struct list_head *);
David Miller
maintainerFrom: Stephen Hemminger <[email protected]>
Date: Tue, 5 Oct 2010 23:24:09 +0900
Quoted 4 lines
Remove dead code and make some functions static.
Compile tested only.Signed-off-by Stephen Hemminger <[email protected]>
Looks good, applied, thanks.