[IPV4]: fib_trie stats fix

[safe/jmp/linux-2.6] / net / ipv4 / netfilter / nf_conntrack_l3proto_ipv4.c

diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index 6c8624a..cb9c661 100644 (file)
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -141,19 +141,21 @@ static unsigned int ipv4_conntrack_help(unsigned int hooknum,
 {
        struct nf_conn *ct;
        enum ip_conntrack_info ctinfo;
+       struct nf_conn_help *help;
 
        /* This is where we call the helper: as the packet goes out. */
        ct = nf_ct_get(*pskb, &ctinfo);
-       if (ct && ct->helper) {
-               unsigned int ret;
-               ret = ct->helper->help(pskb,
-                                      (*pskb)->nh.raw - (*pskb)->data
-                                                      + (*pskb)->nh.iph->ihl*4,
-                                      ct, ctinfo);
-               if (ret != NF_ACCEPT)
-                       return ret;
-       }
-       return NF_ACCEPT;
+       if (!ct)
+               return NF_ACCEPT;
+
+       help = nfct_help(ct);
+       if (!help || !help->helper)
+               return NF_ACCEPT;
+
+       return help->helper->help(pskb,
+                              (*pskb)->nh.raw - (*pskb)->data
+                                              + (*pskb)->nh.iph->ihl*4,
+                              ct, ctinfo);
 }
 
 static unsigned int ipv4_conntrack_defrag(unsigned int hooknum,