/[linux-patches]/genpatches-2.6/trunk/2.6.14/1166_5_nat-init-order-fix.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14/1166_5_nat-init-order-fix.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 235 - (hide annotations) (download) (as text)
Thu Dec 29 16:17:24 2005 UTC (14 years, 11 months ago) by dsd
Original Path: genpatches-2.6/trunk/2.6.14/1066_5_nat-init-order-fix.patch
File MIME type: text/x-diff
File size: 1350 byte(s)
2.6.14.5 thanks to kerframil
1 dsd 235 From: Patrick McHardy <kaber@trash.net>
2     Date: Tue, 20 Dec 2005 00:57:21 +0000 (-0800)
3     Subject: [PATCH] Fix NAT init order
4     X-Git-Url: http://kernel.org/git/?p=linux/kernel/git/gregkh/linux-2.6.14.y.git;a=commitdiff;h=9eda9ffc608c2a200754905ceeb68fda1d2b5873
5    
6     [PATCH] Fix NAT init order
7    
8     As noticed by Phil Oester, the GRE NAT protocol helper is initialized
9     before the NAT core, which makes registration fail.
10    
11     Change the linking order to make NAT be initialized first.
12    
13     Signed-off-by: Patrick McHardy <kaber@trash.net>
14     Signed-off-by: David S. Miller <davem@davemloft.net>
15     Signed-off-by: Chris Wright <chrisw@redhat.com>
16     Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17     ---
18    
19     --- a/net/ipv4/netfilter/Makefile
20     +++ b/net/ipv4/netfilter/Makefile
21     @@ -12,6 +12,7 @@ ip_nat_pptp-objs := ip_nat_helper_pptp.o
22    
23     # connection tracking
24     obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o
25     +obj-$(CONFIG_IP_NF_NAT) += ip_nat.o
26    
27     # conntrack netlink interface
28     obj-$(CONFIG_IP_NF_CONNTRACK_NETLINK) += ip_conntrack_netlink.o
29     @@ -41,7 +42,7 @@ obj-$(CONFIG_IP_NF_IPTABLES) += ip_table
30     # the three instances of ip_tables
31     obj-$(CONFIG_IP_NF_FILTER) += iptable_filter.o
32     obj-$(CONFIG_IP_NF_MANGLE) += iptable_mangle.o
33     -obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o ip_nat.o
34     +obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o
35     obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o
36    
37     # matches

  ViewVC Help
Powered by ViewVC 1.1.20