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

Commit bb94aa16 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: net/ipv[46]/netfilter.c cleanups 



Don't wrap entire file in #ifdef CONFIG_NETFILTER, remove a few
unneccessary includes.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d3f4a687

include/linux/netfilter_ipv6.h

+5 −0
Original line number Diff line number Diff line
@@ -72,7 +72,12 @@ enum nf_ip6_hook_priorities { 
	NF_IP6_PRI_LAST = INT_MAX,

};



#ifdef CONFIG_NETFILTER

extern int ipv6_netfilter_init(void);

extern void ipv6_netfilter_fini(void);

#else /* CONFIG_NETFILTER */

static inline int ipv6_netfilter_init(void) { return 0; }

static inline void ipv6_netfilter_fini(void) { return; }

#endif /* CONFIG_NETFILTER */



#endif /*__LINUX_IP6_NETFILTER_H*/

net/ipv4/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ obj-y := route.o inetpeer.o protocol.o \ 
	     tcp.o tcp_input.o tcp_output.o tcp_timer.o tcp_ipv4.o \

	     tcp_minisocks.o tcp_cong.o \

	     datagram.o raw.o udp.o arp.o icmp.o devinet.o af_inet.o igmp.o \

	     sysctl_net_ipv4.o fib_frontend.o fib_semantics.o netfilter.o

	     sysctl_net_ipv4.o fib_frontend.o fib_semantics.o



obj-$(CONFIG_IP_FIB_HASH) += fib_hash.o

obj-$(CONFIG_IP_FIB_TRIE) += fib_trie.o
@@ -28,7 +28,7 @@ obj-$(CONFIG_IP_ROUTE_MULTIPATH_RR) += multipath_rr.o 
obj-$(CONFIG_IP_ROUTE_MULTIPATH_RANDOM) += multipath_random.o

obj-$(CONFIG_IP_ROUTE_MULTIPATH_WRANDOM) += multipath_wrandom.o

obj-$(CONFIG_IP_ROUTE_MULTIPATH_DRR) += multipath_drr.o

obj-$(CONFIG_NETFILTER)	+= netfilter/

obj-$(CONFIG_NETFILTER)	+= netfilter.o netfilter/

obj-$(CONFIG_IP_VS) += ipvs/

obj-$(CONFIG_INET_DIAG) += inet_diag.o 

obj-$(CONFIG_IP_ROUTE_MULTIPATH_CACHED) += multipath.o

net/ipv4/netfilter.c

+0 −10
Original line number Diff line number Diff line 
/* IPv4 specific functions of netfilter core */



#include <linux/config.h>

#ifdef CONFIG_NETFILTER



#include <linux/kernel.h>

#include <linux/netfilter.h>

#include <linux/netfilter_ipv4.h>



#include <linux/ip.h>

#include <linux/tcp.h>

#include <linux/udp.h>

#include <linux/icmp.h>

#include <net/route.h>

#include <net/xfrm.h>

#include <net/ip.h>
@@ -146,5 +138,3 @@ static void fini(void) 


module_init(init);

module_exit(fini);
 


#endif /* CONFIG_NETFILTER */

net/ipv6/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o sit.o \ 
		route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o raw.o \

		protocol.o icmp.o mcast.o reassembly.o tcp_ipv6.o \

		exthdrs.o sysctl_net_ipv6.o datagram.o proc.o \

		ip6_flowlabel.o ipv6_syms.o netfilter.o \

		inet6_connection_sock.o

		ip6_flowlabel.o ipv6_syms.o inet6_connection_sock.o



ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \

	xfrm6_output.o
@@ -19,7 +18,7 @@ obj-$(CONFIG_INET6_AH) += ah6.o 
obj-$(CONFIG_INET6_ESP) += esp6.o

obj-$(CONFIG_INET6_IPCOMP) += ipcomp6.o

obj-$(CONFIG_INET6_TUNNEL) += xfrm6_tunnel.o 

obj-$(CONFIG_NETFILTER)	+= netfilter/

obj-$(CONFIG_NETFILTER)	+= netfilter.o netfilter/



obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o

net/ipv6/netfilter.c

+2 −17
Original line number Diff line number Diff line 
#include <linux/config.h>

#include <linux/init.h>



#ifdef CONFIG_NETFILTER



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/ipv6.h>

#include <linux/netfilter.h>

#include <linux/netfilter_ipv6.h>
@@ -94,18 +90,7 @@ int __init ipv6_netfilter_init(void) 
	return nf_register_queue_rerouter(PF_INET6, &ip6_reroute);

}



void ipv6_netfilter_fini(void)

void __exit ipv6_netfilter_fini(void)

{

	nf_unregister_queue_rerouter(PF_INET6);

}
 


#else /* CONFIG_NETFILTER */

int __init ipv6_netfilter_init(void)

{

	return 0;

}



void ipv6_netfilter_fini(void)

{

}

#endif /* CONFIG_NETFILTER */