From 29887a880327cab85a60559d5b59139fdd6971be Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Sun, 26 Aug 2012 19:14:29 +0200
Subject: [PATCH] --- yaml --- r: 327789 b: refs/heads/master c:
 320ff567f299ed3f0a2d53906e632a1b0eda5599 h: refs/heads/master i:   327787:
 6421fdef200bb7e8206f790706958e8044154295 v: v3

---
 [refs]                                       | 2 +-
 trunk/net/ipv4/netfilter/Kconfig             | 5 -----
 trunk/net/ipv4/netfilter/Makefile            | 1 -
 trunk/net/netfilter/Kconfig                  | 5 +++++
 trunk/net/netfilter/Makefile                 | 1 +
 trunk/net/netfilter/nf_conntrack_tftp.c      | 3 +--
 trunk/net/{ipv4 => }/netfilter/nf_nat_tftp.c | 0
 7 files changed, 8 insertions(+), 9 deletions(-)
 rename trunk/net/{ipv4 => }/netfilter/nf_nat_tftp.c (100%)

diff --git a/[refs] b/[refs]
index 85124e99ff93..02c040042d40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5901b6be885e2c9a30fd94803b846b3d33e351dd
+refs/heads/master: 320ff567f299ed3f0a2d53906e632a1b0eda5599
diff --git a/trunk/net/ipv4/netfilter/Kconfig b/trunk/net/ipv4/netfilter/Kconfig
index 843fe17db20d..131e53702e77 100644
--- a/trunk/net/ipv4/netfilter/Kconfig
+++ b/trunk/net/ipv4/netfilter/Kconfig
@@ -221,11 +221,6 @@ config NF_NAT_PROTO_GRE
 	tristate
 	depends on NF_NAT_IPV4 && NF_CT_PROTO_GRE
 
-config NF_NAT_TFTP
-	tristate
-	depends on NF_CONNTRACK && NF_NAT_IPV4
-	default NF_NAT_IPV4 && NF_CONNTRACK_TFTP
-
 config NF_NAT_PPTP
 	tristate
 	depends on NF_CONNTRACK && NF_NAT_IPV4
diff --git a/trunk/net/ipv4/netfilter/Makefile b/trunk/net/ipv4/netfilter/Makefile
index 17e649bb98ba..b7dd18987237 100644
--- a/trunk/net/ipv4/netfilter/Makefile
+++ b/trunk/net/ipv4/netfilter/Makefile
@@ -23,7 +23,6 @@ obj-$(CONFIG_NF_DEFRAG_IPV4) += nf_defrag_ipv4.o
 obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
 obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
 obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
-obj-$(CONFIG_NF_NAT_TFTP) += nf_nat_tftp.o
 
 # NAT protocols (nf_nat)
 obj-$(CONFIG_NF_NAT_PROTO_GRE) += nf_nat_proto_gre.o
diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig
index cabe4da0e191..052836e2490e 100644
--- a/trunk/net/netfilter/Kconfig
+++ b/trunk/net/netfilter/Kconfig
@@ -400,6 +400,11 @@ config NF_NAT_SIP
 	depends on NF_CONNTRACK && NF_NAT
 	default NF_NAT && NF_CONNTRACK_SIP
 
+config NF_NAT_TFTP
+	tristate
+	depends on NF_CONNTRACK && NF_NAT
+	default NF_NAT && NF_CONNTRACK_TFTP
+
 endif # NF_CONNTRACK
 
 # transparent proxy support
diff --git a/trunk/net/netfilter/Makefile b/trunk/net/netfilter/Makefile
index 0dd792972cae..403ea8125884 100644
--- a/trunk/net/netfilter/Makefile
+++ b/trunk/net/netfilter/Makefile
@@ -59,6 +59,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_amanda.o
 obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
 obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
 obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
+obj-$(CONFIG_NF_NAT_TFTP) += nf_nat_tftp.o
 
 # transparent proxy support
 obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
diff --git a/trunk/net/netfilter/nf_conntrack_tftp.c b/trunk/net/netfilter/nf_conntrack_tftp.c
index 9363e1c66466..81fc61c05263 100644
--- a/trunk/net/netfilter/nf_conntrack_tftp.c
+++ b/trunk/net/netfilter/nf_conntrack_tftp.c
@@ -72,8 +72,7 @@ static int tftp_help(struct sk_buff *skb,
 		nf_ct_dump_tuple(&exp->tuple);
 
 		nf_nat_tftp = rcu_dereference(nf_nat_tftp_hook);
-		if (nf_nat_tftp && nf_ct_l3num(ct) == NFPROTO_IPV4 &&
-		    ct->status & IPS_NAT_MASK)
+		if (nf_nat_tftp && ct->status & IPS_NAT_MASK)
 			ret = nf_nat_tftp(skb, ctinfo, exp);
 		else if (nf_ct_expect_related(exp) != 0)
 			ret = NF_DROP;
diff --git a/trunk/net/ipv4/netfilter/nf_nat_tftp.c b/trunk/net/netfilter/nf_nat_tftp.c
similarity index 100%
rename from trunk/net/ipv4/netfilter/nf_nat_tftp.c
rename to trunk/net/netfilter/nf_nat_tftp.c