Commit 478374a3 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: ecache: remove one indent level 



nf_conntrack_eventmask_report and nf_ct_deliver_cached_events shared
most of their code.  This unifies the layout by changing

 if (nf_ct_is_confirmed(ct)) {
   foo
 }

 to
 if (!nf_ct_is_confirmed(ct)))
   return
 foo

This removes one level of indentation.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 87e5ef4b

include/net/netfilter/nf_conntrack_ecache.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ struct nf_ct_event { 
};



struct nf_ct_event_notifier {

	int (*fcn)(unsigned int events, struct nf_ct_event *item);

	int (*fcn)(unsigned int events, const struct nf_ct_event *item);

};



int nf_conntrack_register_notifier(struct net *net,

net/netfilter/nf_conntrack_ecache.c

+34 −30
Original line number Diff line number Diff line
@@ -133,10 +133,15 @@ static void ecache_work(struct work_struct *work) 
int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct,

				  u32 portid, int report)

{

	int ret = 0;

	struct net *net = nf_ct_net(ct);

	struct nf_ct_event_notifier *notify;

	struct nf_conntrack_ecache *e;

	struct nf_ct_event item;

	unsigned long missed;

	int ret = 0;



	if (!nf_ct_is_confirmed(ct))

		return ret;



	rcu_read_lock();

	notify = rcu_dereference(net->ct.nf_conntrack_event_cb);
@@ -147,14 +152,14 @@ int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct, 
	if (!e)

		goto out_unlock;



	if (nf_ct_is_confirmed(ct)) {

		struct nf_ct_event item = {

			.ct	= ct,

			.portid	= e->portid ? e->portid : portid,

			.report = report

		};

	memset(&item, 0, sizeof(item));



	item.ct = ct;

	item.portid = e->portid ? e->portid : portid;

	item.report = report;



	/* This is a resent of a destroy event? If so, skip missed */

		unsigned long missed = e->portid ? 0 : e->missed;

	missed = e->portid ? 0 : e->missed;



	if (!((eventmask | missed) & e->ctmask))

		goto out_unlock;
@@ -179,7 +184,6 @@ int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct, 
		}

		spin_unlock_bh(&ct->lock);

	}

	}

out_unlock:

	rcu_read_unlock();

	return ret;

net/netfilter/nf_conntrack_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static size_t ctnetlink_nlmsg_size(const struct nf_conn *ct) 
}



static int

ctnetlink_conntrack_event(unsigned int events, struct nf_ct_event *item)

ctnetlink_conntrack_event(unsigned int events, const struct nf_ct_event *item)

{

	const struct nf_conntrack_zone *zone;

	struct net *net;