lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IPV6]: Make the ipv6/sysctl_net_ipv6.c compilation cleaner

Browse Source 
Since this file is entirely enclosed with the
#ifdef CONFIG_SYSCTL/#endif pair, it's OK to move this
CONFIG_ into a Makefile.

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:43:25 -08:00
committed by David S. Miller
parent 08913681e4
commit 4a61b586cd
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv6/Makefile
View File

@@ -8,9 +8,9 @@ ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \
addrlabel.o \ addrlabel.o \
route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o udplite.o \ route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o udplite.o \
raw.o protocol.o icmp.o mcast.o reassembly.o tcp_ipv6.o \ raw.o protocol.o icmp.o mcast.o reassembly.o tcp_ipv6.o \
exthdrs.o sysctl_net_ipv6.o datagram.o \ exthdrs.o datagram.o ip6_flowlabel.o inet6_connection_sock.o
ip6_flowlabel.o inet6_connection_sock.o
ipv6-$(CONFIG_SYSCTL) = sysctl_net_ipv6.o
ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \ ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \
xfrm6_output.o xfrm6_output.o
ipv6-$(CONFIG_NETFILTER) += netfilter.o ipv6-$(CONFIG_NETFILTER) += netfilter.o

7
net/ipv6/sysctl_net_ipv6.c
View File

@@ -14,8 +14,6 @@
#include <net/addrconf.h> #include <net/addrconf.h>
#include <net/inet_frag.h> #include <net/inet_frag.h>
#ifdef CONFIG_SYSCTL
static ctl_table ipv6_table[] = { static ctl_table ipv6_table[] = {
{ {
.ctl_name = NET_IPV6_ROUTE, .ctl_name = NET_IPV6_ROUTE,
@@ -115,8 +113,3 @@ void ipv6_sysctl_unregister(void)
{ {
unregister_sysctl_table(ipv6_sysctl_header); unregister_sysctl_table(ipv6_sysctl_header);
} }
#endif /* CONFIG_SYSCTL */