summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorGao Feng <fgao@ikuai8.com>2017-02-09 11:46:45 +0300
committerPablo Neira Ayuso <pablo@netfilter.org>2017-02-12 16:39:06 +0300
commita96e66e702bc615f5927b15c739c91d5098dac59 (patch)
tree39dd3a9311fcb5e4018f6d832110d0c99ac6bb5c /net
parent935b7f643018878bd9d4193eea8b575aff736b9b (diff)
downloadlinux-a96e66e702bc615f5927b15c739c91d5098dac59.tar.xz
netfilter: nf_ct_sip: Use mod_timer_pending()
timer_del() followed by timer_add() can be replaced by mod_timer_pending(). Signed-off-by: Gao Feng <fgao@ikuai8.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_sip.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index c3fc14e021ec..24174c520239 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -809,13 +809,11 @@ static int refresh_signalling_expectation(struct nf_conn *ct,
exp->tuple.dst.protonum != proto ||
exp->tuple.dst.u.udp.port != port)
continue;
- if (!del_timer(&exp->timeout))
- continue;
- exp->flags &= ~NF_CT_EXPECT_INACTIVE;
- exp->timeout.expires = jiffies + expires * HZ;
- add_timer(&exp->timeout);
- found = 1;
- break;
+ if (mod_timer_pending(&exp->timeout, jiffies + expires * HZ)) {
+ exp->flags &= ~NF_CT_EXPECT_INACTIVE;
+ found = 1;
+ break;
+ }
}
spin_unlock_bh(&nf_conntrack_expect_lock);
return found;