| From stable-bounces@linux.kernel.org Mon Dec 19 17:00:04 2005 |
| Date: Mon, 19 Dec 2005 16:57:21 -0800 (PST) |
| Message-Id: <20051219.165721.104477890.davem@davemloft.net> |
| To: stable@kernel.org |
| From: "David S. Miller" <davem@davemloft.net> |
| Subject: [NETFILTER]: Fix NAT init order |
| |
| From: Patrick McHardy <kaber@trash.net> |
| |
| As noticed by Phil Oester, the GRE NAT protocol helper is initialized |
| before the NAT core, which makes registration fail. |
| |
| Change the linking order to make NAT be initialized first. |
| |
| Signed-off-by: Patrick McHardy <kaber@trash.net> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Chris Wright <chrisw@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| net/ipv4/netfilter/Makefile | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- linux-2.6.14.4.orig/net/ipv4/netfilter/Makefile |
| +++ linux-2.6.14.4/net/ipv4/netfilter/Makefile |
| @@ -12,6 +12,7 @@ ip_nat_pptp-objs := ip_nat_helper_pptp.o |
| |
| # connection tracking |
| obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o |
| +obj-$(CONFIG_IP_NF_NAT) += ip_nat.o |
| |
| # conntrack netlink interface |
| obj-$(CONFIG_IP_NF_CONNTRACK_NETLINK) += ip_conntrack_netlink.o |
| @@ -41,7 +42,7 @@ obj-$(CONFIG_IP_NF_IPTABLES) += ip_table |
| # the three instances of ip_tables |
| obj-$(CONFIG_IP_NF_FILTER) += iptable_filter.o |
| obj-$(CONFIG_IP_NF_MANGLE) += iptable_mangle.o |
| -obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o ip_nat.o |
| +obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o |
| obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o |
| |
| # matches |
