UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[IPV4]: Cleanup the sysctl_net_ipv4.c file 

This includes several cleanups:

 * tune Makefile to compile out this file when SYSCTL=n. Now
   it looks like net/core/sysctl_net_core.c one;
 * move the ipv4_config to af_inet.c to exist all the time;
 * remove additional sysctl_ip_nonlocal_bind declaration
   (it is already declared in net/ip.h);
 * remove no nonger needed ifdefs from this file.

This is a preparation for using ctl paths for net/ipv4/
sysctl table.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2007-12-05 01:38:23 -08:00 committed by David S. Miller
parent 33eb9cfc70
commit 9ba6397976
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/ipv4/Makefile
View File

@ -10,9 +10,10 @@ obj-y := route.o inetpeer.o protocol.o \
tcp_minisocks.o tcp_cong.o \ tcp_minisocks.o tcp_cong.o \
datagram.o raw.o udp.o udplite.o \ datagram.o raw.o udp.o udplite.o \
arp.o icmp.o devinet.o af_inet.o igmp.o \ arp.o icmp.o devinet.o af_inet.o igmp.o \
sysctl_net_ipv4.o fib_frontend.o fib_semantics.o \ fib_frontend.o fib_semantics.o \
inet_fragment.o inet_fragment.o
obj-$(CONFIG_SYSCTL) += sysctl_net_ipv4.o
obj-$(CONFIG_IP_FIB_HASH) += fib_hash.o obj-$(CONFIG_IP_FIB_HASH) += fib_hash.o
obj-$(CONFIG_IP_FIB_TRIE) += fib_trie.o obj-$(CONFIG_IP_FIB_TRIE) += fib_trie.o
obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_PROC_FS) += proc.o

4
net/ipv4/af_inet.c
View File

@ -126,6 +126,10 @@ extern void ip_mc_drop_socket(struct sock *sk);
static struct list_head inetsw[SOCK_MAX]; static struct list_head inetsw[SOCK_MAX];
static DEFINE_SPINLOCK(inetsw_lock); static DEFINE_SPINLOCK(inetsw_lock);
struct ipv4_config ipv4_config;
EXPORT_SYMBOL(ipv4_config);
/* New destruction routine */ /* New destruction routine */
void inet_sock_destruct(struct sock *sk) void inet_sock_destruct(struct sock *sk)

13
net/ipv4/sysctl_net_ipv4.c
View File

@ -21,19 +21,10 @@
#include <net/cipso_ipv4.h> #include <net/cipso_ipv4.h>
#include <net/inet_frag.h> #include <net/inet_frag.h>
/* From af_inet.c */
extern int sysctl_ip_nonlocal_bind;
#ifdef CONFIG_SYSCTL
static int zero; static int zero;
static int tcp_retr1_max = 255; static int tcp_retr1_max = 255;
static int ip_local_port_range_min[] = { 1, 1 }; static int ip_local_port_range_min[] = { 1, 1 };
static int ip_local_port_range_max[] = { 65535, 65535 }; static int ip_local_port_range_max[] = { 65535, 65535 };
#endif
struct ipv4_config ipv4_config;
#ifdef CONFIG_SYSCTL
static static
int ipv4_sysctl_forward(ctl_table *ctl, int write, struct file * filp, int ipv4_sysctl_forward(ctl_table *ctl, int write, struct file * filp,
@ -887,7 +878,3 @@ ctl_table ipv4_table[] = {
}, },
{ .ctl_name = 0 } { .ctl_name = 0 }
}; };
#endif /* CONFIG_SYSCTL */
EXPORT_SYMBOL(ipv4_config);