From d67e970af01afcabc7da8c91a1a7d7c35331cd02 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@computergmbh.de>
Date: Wed, 9 Apr 2008 15:14:58 -0700
Subject: [PATCH] --- yaml --- r: 88270 b: refs/heads/master c:
 475959d4773e53a2700e523dd30acebbd47556a5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 18caa2035ca1..ccbf4be327b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b9b70ea2ebaab26c3e4fed385dfab6fc16359ed
+refs/heads/master: 475959d4773e53a2700e523dd30acebbd47556a5
diff --git a/trunk/net/ipv4/netfilter/nf_nat_core.c b/trunk/net/ipv4/netfilter/nf_nat_core.c
index 0d5fa3a54d04..36b4e3bb056f 100644
--- a/trunk/net/ipv4/netfilter/nf_nat_core.c
+++ b/trunk/net/ipv4/netfilter/nf_nat_core.c
@@ -629,6 +629,8 @@ static int __init nf_nat_init(void)
 	size_t i;
 	int ret;
 
+	need_ipv4_conntrack();
+
 	ret = nf_ct_extend_register(&nat_extend);
 	if (ret < 0) {
 		printk(KERN_ERR "nf_nat_core: Unable to register extension\n");