--- zzzz-none-000/linux-2.6.19.2/net/netfilter/nf_conntrack_netlink.c 2007-01-10 19:10:37.000000000 +0000 +++ davinci-8020-5505/linux-2.6.19.2/net/netfilter/nf_conntrack_netlink.c 2007-01-11 07:38:19.000000000 +0000 @@ -161,7 +161,6 @@ return ret; nfattr_failure: - nf_ct_proto_put(proto); return -1; } @@ -950,7 +949,6 @@ { struct nf_conn *ct; int err = -EINVAL; - struct nf_conn_help *help; ct = nf_conntrack_alloc(otuple, rtuple); if (ct == NULL || IS_ERR(ct)) @@ -978,16 +976,9 @@ ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1])); #endif - help = nfct_help(ct); - if (help) - help->helper = nf_ct_helper_find_get(rtuple); - add_timer(&ct->timeout); nf_conntrack_hash_insert(ct); - if (help && help->helper) - nf_ct_helper_put(help->helper); - return 0; err: