diff options
| author | Gao Feng | 2017-03-27 04:31:26 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2017-04-06 18:39:40 +0200 |
| commit | ec0e3f01114ad327112432a4da8840eb22fed577 (patch) | |
| tree | ce5e2fe065270a012e7fb2cabd6f4207a3711f33 /net/netfilter/nf_conntrack_helper.c | |
| parent | netfilter: expect: Make sure the max_expected limit is effective (diff) | |
| download | kernel-qcow2-linux-ec0e3f01114ad327112432a4da8840eb22fed577.tar.gz kernel-qcow2-linux-ec0e3f01114ad327112432a4da8840eb22fed577.tar.xz kernel-qcow2-linux-ec0e3f01114ad327112432a4da8840eb22fed577.zip | |
netfilter: nf_ct_expect: Add nf_ct_remove_expect()
When remove one expect, it needs three statements. And there are
multiple duplicated codes in current code. So add one common function
nf_ct_remove_expect to consolidate this.
Signed-off-by: Gao Feng <fgao@ikuai8.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_helper.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_helper.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c index 752a977e9eef..33ebb78649f8 100644 --- a/net/netfilter/nf_conntrack_helper.c +++ b/net/netfilter/nf_conntrack_helper.c @@ -451,11 +451,8 @@ void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me) if ((rcu_dereference_protected( help->helper, lockdep_is_held(&nf_conntrack_expect_lock) - ) == me || exp->helper == me) && - del_timer(&exp->timeout)) { - nf_ct_unlink_expect(exp); - nf_ct_expect_put(exp); - } + ) == me || exp->helper == me)) + nf_ct_remove_expect(exp); } } spin_unlock_bh(&nf_conntrack_expect_lock); |