mirror of https://gitee.com/openkylin/linux.git
[IPV4]: possible cleanups
This patch contains the following possible cleanups: - make needlessly global code static - #if 0 the following unused global function: - xfrm4_state.c: xfrm4_state_fini - remove the following unneeded EXPORT_SYMBOL's: - ip_output.c: ip_finish_output - ip_output.c: sysctl_ip_default_ttl - fib_frontend.c: ip_dev_find - inetpeer.c: inet_peer_idlock - ip_options.c: ip_options_compile - ip_options.c: ip_options_undo - net/core/request_sock.c: sysctl_max_syn_backlog Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f2ccd8fa06
commit
0742fd53a3
|
@ -140,8 +140,6 @@ struct ip_reply_arg {
|
|||
void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg,
|
||||
unsigned int len);
|
||||
|
||||
extern int ip_finish_output(struct sk_buff *skb);
|
||||
|
||||
struct ipv4_config
|
||||
{
|
||||
int log_martians;
|
||||
|
|
|
@ -105,10 +105,6 @@ struct rt_cache_stat
|
|||
unsigned int out_hlist_search;
|
||||
};
|
||||
|
||||
extern struct rt_cache_stat *rt_cache_stat;
|
||||
#define RT_CACHE_STAT_INC(field) \
|
||||
(per_cpu_ptr(rt_cache_stat, raw_smp_processor_id())->field++)
|
||||
|
||||
extern struct ip_rt_acct *ip_rt_acct;
|
||||
|
||||
struct in_device;
|
||||
|
|
|
@ -818,7 +818,6 @@ extern void xfrm6_init(void);
|
|||
extern void xfrm6_fini(void);
|
||||
extern void xfrm_state_init(void);
|
||||
extern void xfrm4_state_init(void);
|
||||
extern void xfrm4_state_fini(void);
|
||||
extern void xfrm6_state_init(void);
|
||||
extern void xfrm6_state_fini(void);
|
||||
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
* Further increasing requires to change hash table size.
|
||||
*/
|
||||
int sysctl_max_syn_backlog = 256;
|
||||
EXPORT_SYMBOL(sysctl_max_syn_backlog);
|
||||
|
||||
int reqsk_queue_alloc(struct request_sock_queue *queue,
|
||||
const int nr_table_entries)
|
||||
|
|
|
@ -662,5 +662,4 @@ void __init ip_fib_init(void)
|
|||
}
|
||||
|
||||
EXPORT_SYMBOL(inet_addr_type);
|
||||
EXPORT_SYMBOL(ip_dev_find);
|
||||
EXPORT_SYMBOL(ip_rt_ioctl);
|
||||
|
|
|
@ -459,5 +459,3 @@ static void peer_check_expire(unsigned long dummy)
|
|||
peer_total / inet_peer_threshold * HZ;
|
||||
add_timer(&peer_periodic_timer);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(inet_peer_idlock);
|
||||
|
|
|
@ -620,6 +620,3 @@ int ip_options_rcv_srr(struct sk_buff *skb)
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(ip_options_compile);
|
||||
EXPORT_SYMBOL(ip_options_undo);
|
||||
|
|
|
@ -205,7 +205,7 @@ static inline int ip_finish_output2(struct sk_buff *skb)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
int ip_finish_output(struct sk_buff *skb)
|
||||
static int ip_finish_output(struct sk_buff *skb)
|
||||
{
|
||||
struct net_device *dev = skb->dst->dev;
|
||||
|
||||
|
@ -1328,12 +1328,7 @@ void __init ip_init(void)
|
|||
#endif
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(ip_finish_output);
|
||||
EXPORT_SYMBOL(ip_fragment);
|
||||
EXPORT_SYMBOL(ip_generic_getfrag);
|
||||
EXPORT_SYMBOL(ip_queue_xmit);
|
||||
EXPORT_SYMBOL(ip_send_check);
|
||||
|
||||
#ifdef CONFIG_SYSCTL
|
||||
EXPORT_SYMBOL(sysctl_ip_default_ttl);
|
||||
#endif
|
||||
|
|
|
@ -107,7 +107,7 @@ static int drr_dev_event(struct notifier_block *this,
|
|||
return NOTIFY_DONE;
|
||||
}
|
||||
|
||||
struct notifier_block drr_dev_notifier = {
|
||||
static struct notifier_block drr_dev_notifier = {
|
||||
.notifier_call = drr_dev_event,
|
||||
};
|
||||
|
||||
|
|
|
@ -240,7 +240,9 @@ static unsigned rt_hash_mask;
|
|||
static int rt_hash_log;
|
||||
static unsigned int rt_hash_rnd;
|
||||
|
||||
struct rt_cache_stat *rt_cache_stat;
|
||||
static struct rt_cache_stat *rt_cache_stat;
|
||||
#define RT_CACHE_STAT_INC(field) \
|
||||
(per_cpu_ptr(rt_cache_stat, raw_smp_processor_id())->field++)
|
||||
|
||||
static int rt_intern_hash(unsigned hash, struct rtable *rth,
|
||||
struct rtable **res);
|
||||
|
|
|
@ -128,8 +128,10 @@ void __init xfrm4_state_init(void)
|
|||
xfrm_state_register_afinfo(&xfrm4_state_afinfo);
|
||||
}
|
||||
|
||||
#if 0
|
||||
void __exit xfrm4_state_fini(void)
|
||||
{
|
||||
xfrm_state_unregister_afinfo(&xfrm4_state_afinfo);
|
||||
}
|
||||
#endif /* 0 */
|
||||
|
||||
|
|
Loading…
Reference in New Issue