Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[NETFILTER]: net/ipv[46]/netfilter.c cleanups
Don't wrap entire file in #ifdef CONFIG_NETFILTER, remove a few
unneccessary includes.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by
Patrick McHardy
and committed by
David S. Miller
bb94aa16
d3f4a687
+5
include/linux/netfilter_ipv6.h
+5
include/linux/netfilter_ipv6.h
···
72
72
NF_IP6_PRI_LAST = INT_MAX,
73
73
};
74
74
75
+
#ifdef CONFIG_NETFILTER
75
76
extern int ipv6_netfilter_init(void);
76
77
extern void ipv6_netfilter_fini(void);
78
+
#else /* CONFIG_NETFILTER */
79
+
static inline int ipv6_netfilter_init(void) { return 0; }
80
+
static inline void ipv6_netfilter_fini(void) { return; }
81
+
#endif /* CONFIG_NETFILTER */
77
82
78
83
#endif /*__LINUX_IP6_NETFILTER_H*/
+2
-2
net/ipv4/Makefile
+2
-2
net/ipv4/Makefile
···
9
9
tcp.o tcp_input.o tcp_output.o tcp_timer.o tcp_ipv4.o \
10
10
tcp_minisocks.o tcp_cong.o \
11
11
datagram.o raw.o udp.o arp.o icmp.o devinet.o af_inet.o igmp.o \
12
-
sysctl_net_ipv4.o fib_frontend.o fib_semantics.o netfilter.o
12
+
sysctl_net_ipv4.o fib_frontend.o fib_semantics.o
13
13
14
14
obj-$(CONFIG_IP_FIB_HASH) += fib_hash.o
15
15
obj-$(CONFIG_IP_FIB_TRIE) += fib_trie.o
···
28
28
obj-$(CONFIG_IP_ROUTE_MULTIPATH_RANDOM) += multipath_random.o
29
29
obj-$(CONFIG_IP_ROUTE_MULTIPATH_WRANDOM) += multipath_wrandom.o
30
30
obj-$(CONFIG_IP_ROUTE_MULTIPATH_DRR) += multipath_drr.o
31
-
obj-$(CONFIG_NETFILTER) += netfilter/
31
+
obj-$(CONFIG_NETFILTER) += netfilter.o netfilter/
32
32
obj-$(CONFIG_IP_VS) += ipvs/
33
33
obj-$(CONFIG_INET_DIAG) += inet_diag.o
34
34
obj-$(CONFIG_IP_ROUTE_MULTIPATH_CACHED) += multipath.o
-10
net/ipv4/netfilter.c
-10
net/ipv4/netfilter.c
···
1
1
/* IPv4 specific functions of netfilter core */
2
-
3
-
#include <linux/config.h>
4
-
#ifdef CONFIG_NETFILTER
5
-
6
2
#include <linux/kernel.h>
7
3
#include <linux/netfilter.h>
8
4
#include <linux/netfilter_ipv4.h>
9
-
10
5
#include <linux/ip.h>
11
-
#include <linux/tcp.h>
12
-
#include <linux/udp.h>
13
-
#include <linux/icmp.h>
14
6
#include <net/route.h>
15
7
#include <net/xfrm.h>
16
8
#include <net/ip.h>
···
138
146
139
147
module_init(init);
140
148
module_exit(fini);
141
-
142
-
#endif /* CONFIG_NETFILTER */
+2
-3
net/ipv6/Makefile
+2
-3
net/ipv6/Makefile
···
8
8
route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o raw.o \
9
9
protocol.o icmp.o mcast.o reassembly.o tcp_ipv6.o \
10
10
exthdrs.o sysctl_net_ipv6.o datagram.o proc.o \
11
-
ip6_flowlabel.o ipv6_syms.o netfilter.o \
12
-
inet6_connection_sock.o
11
+
ip6_flowlabel.o ipv6_syms.o inet6_connection_sock.o
13
12
14
13
ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \
15
14
xfrm6_output.o
···
18
19
obj-$(CONFIG_INET6_ESP) += esp6.o
19
20
obj-$(CONFIG_INET6_IPCOMP) += ipcomp6.o
20
21
obj-$(CONFIG_INET6_TUNNEL) += xfrm6_tunnel.o
21
-
obj-$(CONFIG_NETFILTER) += netfilter/
22
+
obj-$(CONFIG_NETFILTER) += netfilter.o netfilter/
22
23
23
24
obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o
24
25
+2
-17
net/ipv6/netfilter.c
+2
-17
net/ipv6/netfilter.c
···
1
-
#include <linux/config.h>
2
-
#include <linux/init.h>
3
-
4
-
#ifdef CONFIG_NETFILTER
5
-
6
1
#include <linux/kernel.h>
2
+
#include <linux/init.h>
7
3
#include <linux/ipv6.h>
8
4
#include <linux/netfilter.h>
9
5
#include <linux/netfilter_ipv6.h>
···
90
94
return nf_register_queue_rerouter(PF_INET6, &ip6_reroute);
91
95
}
92
96
93
-
void ipv6_netfilter_fini(void)
97
+
void __exit ipv6_netfilter_fini(void)
94
98
{
95
99
nf_unregister_queue_rerouter(PF_INET6);
96
100
}
97
-
98
-
#else /* CONFIG_NETFILTER */
99
-
int __init ipv6_netfilter_init(void)
100
-
{
101
-
return 0;
102
-
}
103
-
104
-
void ipv6_netfilter_fini(void)
105
-
{
106
-
}
107
-
#endif /* CONFIG_NETFILTER */