From 1c4eacc84d9f56a39739cf3457699a153fed95cc Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@netfilter.org>
Date: Mon, 8 Aug 2005 11:50:55 +0200
Subject: [PATCH] --- yaml --- r: 5713 b: refs/heads/master c:
 8b83bc77bf77cc8459cb94e52b08e775104c4c48 h: refs/heads/master i:   5711:
 5c7e2999d89647b068acb6a9fd3d07d1a720c560 v: v3

---
 [refs]                                       | 2 +-
 trunk/net/ipv4/netfilter/ip_nat_standalone.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3cf60006f998..41973f05c8da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48de5beeb0ee821859c79ba5b9462654604d8bf3
+refs/heads/master: 8b83bc77bf77cc8459cb94e52b08e775104c4c48
diff --git a/trunk/net/ipv4/netfilter/ip_nat_standalone.c b/trunk/net/ipv4/netfilter/ip_nat_standalone.c
index bc59d0d6e89e..91d5ea1dbbc9 100644
--- a/trunk/net/ipv4/netfilter/ip_nat_standalone.c
+++ b/trunk/net/ipv4/netfilter/ip_nat_standalone.c
@@ -102,6 +102,10 @@ ip_nat_fn(unsigned int hooknum,
 		return NF_ACCEPT;
 	}
 
+	/* Don't try to NAT if this packet is not conntracked */
+	if (ct == &ip_conntrack_untracked)
+		return NF_ACCEPT;
+
 	switch (ctinfo) {
 	case IP_CT_RELATED:
 	case IP_CT_RELATED+IP_CT_IS_REPLY: