aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-12-05 04:38:23 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:56:27 -0500
commit9ba639797606acbcd97be886f41fbce163914e7b (patch)
tree49320d143d43a79f57f0ec9e994df338ee0a4db6
parent33eb9cfc700ae9ce621d47d6ca6d6b4ad7cd97f3 (diff)
[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>
-rw-r--r--net/ipv4/Makefile3
-rw-r--r--net/ipv4/af_inet.c4
-rw-r--r--net/ipv4/sysctl_net_ipv4.c13
3 files changed, 6 insertions, 14 deletions
diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile
index 93fe3966805d..ad40ef3f9ebc 100644
--- a/net/ipv4/Makefile
+++ b/net/ipv4/Makefile
@@ -10,9 +10,10 @@ obj-y := route.o inetpeer.o protocol.o \
10 tcp_minisocks.o tcp_cong.o \ 10 tcp_minisocks.o tcp_cong.o \
11 datagram.o raw.o udp.o udplite.o \ 11 datagram.o raw.o udp.o udplite.o \
12 arp.o icmp.o devinet.o af_inet.o igmp.o \ 12 arp.o icmp.o devinet.o af_inet.o igmp.o \
13 sysctl_net_ipv4.o fib_frontend.o fib_semantics.o \ 13 fib_frontend.o fib_semantics.o \
14 inet_fragment.o 14 inet_fragment.o
15 15
16obj-$(CONFIG_SYSCTL) += sysctl_net_ipv4.o
16obj-$(CONFIG_IP_FIB_HASH) += fib_hash.o 17obj-$(CONFIG_IP_FIB_HASH) += fib_hash.o
17obj-$(CONFIG_IP_FIB_TRIE) += fib_trie.o 18obj-$(CONFIG_IP_FIB_TRIE) += fib_trie.o
18obj-$(CONFIG_PROC_FS) += proc.o 19obj-$(CONFIG_PROC_FS) += proc.o
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index c75f20b49935..0e4b6eba2340 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -126,6 +126,10 @@ extern void ip_mc_drop_socket(struct sock *sk);
126static struct list_head inetsw[SOCK_MAX]; 126static struct list_head inetsw[SOCK_MAX];
127static DEFINE_SPINLOCK(inetsw_lock); 127static DEFINE_SPINLOCK(inetsw_lock);
128 128
129struct ipv4_config ipv4_config;
130
131EXPORT_SYMBOL(ipv4_config);
132
129/* New destruction routine */ 133/* New destruction routine */
130 134
131void inet_sock_destruct(struct sock *sk) 135void inet_sock_destruct(struct sock *sk)
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index bec6fe880657..3546424765f5 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -21,19 +21,10 @@
21#include <net/cipso_ipv4.h> 21#include <net/cipso_ipv4.h>
22#include <net/inet_frag.h> 22#include <net/inet_frag.h>
23 23
24/* From af_inet.c */
25extern int sysctl_ip_nonlocal_bind;
26
27#ifdef CONFIG_SYSCTL
28static int zero; 24static int zero;
29static int tcp_retr1_max = 255; 25static int tcp_retr1_max = 255;
30static int ip_local_port_range_min[] = { 1, 1 }; 26static int ip_local_port_range_min[] = { 1, 1 };
31static int ip_local_port_range_max[] = { 65535, 65535 }; 27static int ip_local_port_range_max[] = { 65535, 65535 };
32#endif
33
34struct ipv4_config ipv4_config;
35
36#ifdef CONFIG_SYSCTL
37 28
38static 29static
39int ipv4_sysctl_forward(ctl_table *ctl, int write, struct file * filp, 30int ipv4_sysctl_forward(ctl_table *ctl, int write, struct file * filp,
@@ -887,7 +878,3 @@ ctl_table ipv4_table[] = {
887 }, 878 },
888 { .ctl_name = 0 } 879 { .ctl_name = 0 }
889}; 880};
890
891#endif /* CONFIG_SYSCTL */
892
893EXPORT_SYMBOL(ipv4_config);