|
@@ -224,17 +224,8 @@ static void death_by_timeout(unsigned long ul_conntrack)
|
|
|
{
|
|
|
struct nf_conn *ct = (void *)ul_conntrack;
|
|
|
struct net *net = nf_ct_net(ct);
|
|
|
- struct nf_conn_help *help = nfct_help(ct);
|
|
|
- struct nf_conntrack_helper *helper;
|
|
|
-
|
|
|
- if (help) {
|
|
|
- rcu_read_lock();
|
|
|
- helper = rcu_dereference(help->helper);
|
|
|
- if (helper && helper->destroy)
|
|
|
- helper->destroy(ct);
|
|
|
- rcu_read_unlock();
|
|
|
- }
|
|
|
|
|
|
+ nf_ct_helper_destroy(ct);
|
|
|
spin_lock_bh(&nf_conntrack_lock);
|
|
|
/* Inside lock so preempt is disabled on module removal path.
|
|
|
* Otherwise we can get spurious warnings. */
|