Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a61b586 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

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



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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 08913681

net/ipv6/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \ 
		addrlabel.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 \

		exthdrs.o sysctl_net_ipv6.o datagram.o \

		ip6_flowlabel.o inet6_connection_sock.o

		exthdrs.o datagram.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 \

	xfrm6_output.o

ipv6-$(CONFIG_NETFILTER) += netfilter.o

net/ipv6/sysctl_net_ipv6.c

+0 −7
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
#include <net/addrconf.h>

#include <net/inet_frag.h>



#ifdef CONFIG_SYSCTL



static ctl_table ipv6_table[] = {

	{

		.ctl_name	= NET_IPV6_ROUTE,
@@ -115,8 +113,3 @@ void ipv6_sysctl_unregister(void) 
{

	unregister_sysctl_table(ipv6_sysctl_header);

}
 


#endif /* CONFIG_SYSCTL */