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>

diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
index 3f1e0add58bcd4d291d6dcb0ac4303675e0fedb5..127a0fa6ae430dbf079b461b1eaae9590f4c82fc 100644 (file)
--- a/net/netfilter/nf_conntrack_ecache.c
+++ b/net/netfilter/nf_conntrack_ecache.c
@@ -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;