diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
commit | 57445428488a2862840c4d7c96d7746c11031aaf (patch) | |
tree | 60b88b3a21896a33ee4dccc727d88b745a9ff731 /net/ipv4 | |
parent | 2e837819b1563679b55363d469239fdf4f17fbbb (diff) |
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/Makefile | 1 | ||||
-rw-r--r-- | net/ipv4/netfilter/Makefile | 1 | ||||
-rw-r--r-- | net/ipv4/netfilter/ip_tables.c | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile index a0d501ec5..b162de66c 100644 --- a/net/ipv4/Makefile +++ b/net/ipv4/Makefile @@ -16,7 +16,6 @@ IPV4_OBJS := utils.o route.o inetpeer.o proc.o protocol.o \ sysctl_net_ipv4.o fib_frontend.o fib_semantics.o fib_hash.o IPV4X_OBJS := -MOD_LIST_NAME := IPV4_MODULES M_OBJS := ifeq ($(CONFIG_IP_MULTIPLE_TABLES),y) diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile index bc892e7db..cbf6e19eb 100644 --- a/net/ipv4/netfilter/Makefile +++ b/net/ipv4/netfilter/Makefile @@ -8,7 +8,6 @@ # Note 2! The CFLAGS definition is now in the main makefile... O_TARGET := netfilter.o -MOD_LIST_NAME := IPV4_MODULES M_OBJS := IP_NF_CONNTRACK_OBJ:=ip_conntrack_core.o ip_conntrack_proto_generic.o ip_conntrack_proto_tcp.o ip_conntrack_proto_udp.o ip_conntrack_proto_icmp.o diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 7a24b21dd..cfc8ca6da 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c @@ -1753,6 +1753,8 @@ EXPORT_SYMBOL(ipt_unregister_table); EXPORT_SYMBOL(ipt_register_match); EXPORT_SYMBOL(ipt_unregister_match); EXPORT_SYMBOL(ipt_do_table); +EXPORT_SYMBOL(ipt_register_target); +EXPORT_SYMBOL(ipt_unregister_target); module_init(init); module_exit(fini); |