Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
+2
-1
net/ipv6/Makefile
+2
-1
net/ipv6/Makefile
···
12
12
13
13
ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \
14
14
xfrm6_output.o
15
+
ipv6-$(CONFIG_NETFILTER) += netfilter.o
15
16
ipv6-objs += $(ipv6-y)
16
17
17
18
obj-$(CONFIG_INET6_AH) += ah6.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.o netfilter/
22
+
obj-$(CONFIG_NETFILTER) += netfilter/
22
23
23
24
obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o
24
25
+4
-1
net/ipv6/netfilter.c
+4
-1
net/ipv6/netfilter.c
···
90
90
return nf_register_queue_rerouter(PF_INET6, &ip6_reroute);
91
91
}
92
92
93
-
void __exit ipv6_netfilter_fini(void)
93
+
/* This can be called from inet6_init() on errors, so it cannot
94
+
* be marked __exit. -DaveM
95
+
*/
96
+
void ipv6_netfilter_fini(void)
94
97
{
95
98
nf_unregister_queue_rerouter(PF_INET6);
96
99
}