Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[karo-tx-linux.git] / net / netfilter / nf_conntrack_netbios_ns.c

diff --git a/net/netfilter/nf_conntrack_netbios_ns.c b/net/netfilter/nf_conntrack_netbios_ns.c
index a5b234e444dc789c2ae5fe679408a329512bb847..bb26a658cc1cfb423bc173e26a310347bb4da97f 100644 (file)
--- a/net/netfilter/nf_conntrack_netbios_ns.c
+++ b/net/netfilter/nf_conntrack_netbios_ns.c
@@ -43,7 +43,7 @@ module_param(timeout, uint, 0400);
 MODULE_PARM_DESC(timeout, "timeout for master connection/replies in seconds");
 
 static int help(struct sk_buff **pskb, unsigned int protoff,
-                struct nf_conn *ct, enum ip_conntrack_info ctinfo)
+               struct nf_conn *ct, enum ip_conntrack_info ctinfo)
 {
        struct nf_conntrack_expect *exp;
        struct iphdr *iph = (*pskb)->nh.iph;
@@ -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);