From a46bb7b37994266e7b3440145b87e63daf4edf93 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 9 Jan 2007 00:03:26 -0800
Subject: [PATCH] --- yaml --- r: 45412 b: refs/heads/master c:
 88044c8c9635b2ec67a27c6f334965e5b97eb2c7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fc093ee560fa..4e96431c26e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1d2a1965a00693bddaddf75d57488a0d8e891af
+refs/heads/master: 88044c8c9635b2ec67a27c6f334965e5b97eb2c7
diff --git a/trunk/net/netfilter/nf_conntrack_netbios_ns.c b/trunk/net/netfilter/nf_conntrack_netbios_ns.c
index a5b234e444dc..2a48efdf0d67 100644
--- a/trunk/net/netfilter/nf_conntrack_netbios_ns.c
+++ b/trunk/net/netfilter/nf_conntrack_netbios_ns.c
@@ -89,6 +89,7 @@ static int help(struct sk_buff **pskb, unsigned int protoff,
 
 	exp->expectfn             = NULL;
 	exp->flags                = NF_CT_EXPECT_PERMANENT;
+	exp->helper               = NULL;
 
 	nf_conntrack_expect_related(exp);
 	nf_conntrack_expect_put(exp);