mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
netfilter: ecache: remove another indent level
... by changing: if (unlikely(ret < 0 || missed)) { if (ret < 0) { to if (likely(ret >= 0 && !missed)) goto out; if (ret < 0) { After this nf_conntrack_eventmask_report and nf_ct_deliver_cached_events look pretty much the same, next patch moves common code to a helper. This patch has no effect on generated code. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
parent
478374a3c1
commit
9291f0902d
1 changed files with 18 additions and 16 deletions
|
@ -165,25 +165,27 @@ int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct,
|
|||
goto out_unlock;
|
||||
|
||||
ret = notify->fcn(eventmask | missed, &item);
|
||||
if (unlikely(ret < 0 || missed)) {
|
||||
spin_lock_bh(&ct->lock);
|
||||
if (ret < 0) {
|
||||
/* This is a destroy event that has been
|
||||
* triggered by a process, we store the PORTID
|
||||
* to include it in the retransmission.
|
||||
*/
|
||||
if (eventmask & (1 << IPCT_DESTROY)) {
|
||||
if (e->portid == 0 && portid != 0)
|
||||
e->portid = portid;
|
||||
e->state = NFCT_ECACHE_DESTROY_FAIL;
|
||||
} else {
|
||||
e->missed |= eventmask;
|
||||
}
|
||||
if (likely(ret >= 0 && !missed))
|
||||
goto out_unlock;
|
||||
|
||||
spin_lock_bh(&ct->lock);
|
||||
if (ret < 0) {
|
||||
/* This is a destroy event that has been
|
||||
* triggered by a process, we store the PORTID
|
||||
* to include it in the retransmission.
|
||||
*/
|
||||
if (eventmask & (1 << IPCT_DESTROY)) {
|
||||
if (e->portid == 0 && portid != 0)
|
||||
e->portid = portid;
|
||||
e->state = NFCT_ECACHE_DESTROY_FAIL;
|
||||
} else {
|
||||
e->missed &= ~missed;
|
||||
e->missed |= eventmask;
|
||||
}
|
||||
spin_unlock_bh(&ct->lock);
|
||||
} else {
|
||||
e->missed &= ~missed;
|
||||
}
|
||||
spin_unlock_bh(&ct->lock);
|
||||
|
||||
out_unlock:
|
||||
rcu_read_unlock();
|
||||
return ret;
|
||||
|
|
Loading…
Reference in a new issue