Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16b26cde authored by Jeremy Sowden's avatar Jeremy Sowden Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: use consistent style when defining inline functions 



The header contains some inline functions defined as:

  static inline f (...)
  {
  #ifdef CONFIG_NF_CONNTRACK_EVENTS
    ...
  #else
    ...
  #endif
  }

and a few others as:

  #ifdef CONFIG_NF_CONNTRACK_EVENTS
  static inline f (...)
  {
    ...
  }
  #else
  static inline f (...)
  {
    ...
  }
  #endif

Prefer the former style, which is more numerous.

Signed-off-by: default avatarJeremy Sowden <jeremy@azazel.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 46705b07

include/net/netfilter/nf_conntrack_ecache.h

+50 −32
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ nf_ct_ecache_ext_add(struct nf_conn *ct, u16 ctmask, u16 expmask, gfp_t gfp) 
}



#ifdef CONFIG_NF_CONNTRACK_EVENTS



/* This structure is passed to event handler */

struct nf_ct_event {

	struct nf_conn *ct;
@@ -84,9 +85,26 @@ void nf_ct_deliver_cached_events(struct nf_conn *ct); 
int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct,

				  u32 portid, int report);



#else



static inline void nf_ct_deliver_cached_events(const struct nf_conn *ct)

{

}



static inline int nf_conntrack_eventmask_report(unsigned int eventmask,

						struct nf_conn *ct,

						u32 portid,

						int report)

{

	return 0;

}



#endif



static inline void

nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct)

{

#ifdef CONFIG_NF_CONNTRACK_EVENTS

	struct net *net = nf_ct_net(ct);

	struct nf_conntrack_ecache *e;
@@ -98,31 +116,42 @@ nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct) 
		return;



	set_bit(event, &e->cache);

#endif

}



static inline int

nf_conntrack_event_report(enum ip_conntrack_events event, struct nf_conn *ct,

			  u32 portid, int report)

{

#ifdef CONFIG_NF_CONNTRACK_EVENTS

	const struct net *net = nf_ct_net(ct);



	if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb))

		return 0;



	return nf_conntrack_eventmask_report(1 << event, ct, portid, report);

#else

	return 0;

#endif

}



static inline int

nf_conntrack_event(enum ip_conntrack_events event, struct nf_conn *ct)

{

#ifdef CONFIG_NF_CONNTRACK_EVENTS

	const struct net *net = nf_ct_net(ct);



	if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb))

		return 0;



	return nf_conntrack_eventmask_report(1 << event, ct, 0, 0);

#else

	return 0;

#endif

}



#ifdef CONFIG_NF_CONNTRACK_EVENTS



struct nf_exp_event {

	struct nf_conntrack_expect *exp;

	u32 portid;
@@ -148,41 +177,18 @@ void nf_conntrack_ecache_pernet_fini(struct net *net); 
int nf_conntrack_ecache_init(void);

void nf_conntrack_ecache_fini(void);



static inline void nf_conntrack_ecache_delayed_work(struct net *net)

{

	if (!delayed_work_pending(&net->ct.ecache_dwork)) {

		schedule_delayed_work(&net->ct.ecache_dwork, HZ);

		net->ct.ecache_dwork_pending = true;

	}

}



static inline void nf_conntrack_ecache_work(struct net *net)

{

	if (net->ct.ecache_dwork_pending) {

		net->ct.ecache_dwork_pending = false;

		mod_delayed_work(system_wq, &net->ct.ecache_dwork, 0);

	}

}

#else /* CONFIG_NF_CONNTRACK_EVENTS */

static inline void nf_conntrack_event_cache(enum ip_conntrack_events event,

					    struct nf_conn *ct) {}

static inline int nf_conntrack_eventmask_report(unsigned int eventmask,

						struct nf_conn *ct,

						u32 portid,

						int report) { return 0; }

static inline int nf_conntrack_event(enum ip_conntrack_events event,

				     struct nf_conn *ct) { return 0; }

static inline int nf_conntrack_event_report(enum ip_conntrack_events event,

					    struct nf_conn *ct,

					    u32 portid,

					    int report) { return 0; }

static inline void nf_ct_deliver_cached_events(const struct nf_conn *ct) {}



static inline void nf_ct_expect_event_report(enum ip_conntrack_expect_events e,

					     struct nf_conntrack_expect *exp,

					     u32 portid,

 					     int report) {}

					     int report)

{

}



static inline void nf_conntrack_ecache_pernet_init(struct net *net) {}

static inline void nf_conntrack_ecache_pernet_init(struct net *net)

{

}



static inline void nf_conntrack_ecache_pernet_fini(struct net *net)

{
@@ -197,14 +203,26 @@ static inline void nf_conntrack_ecache_fini(void) 
{

}



#endif /* CONFIG_NF_CONNTRACK_EVENTS */



static inline void nf_conntrack_ecache_delayed_work(struct net *net)

{

#ifdef CONFIG_NF_CONNTRACK_EVENTS

	if (!delayed_work_pending(&net->ct.ecache_dwork)) {

		schedule_delayed_work(&net->ct.ecache_dwork, HZ);

		net->ct.ecache_dwork_pending = true;

	}

#endif

}



static inline void nf_conntrack_ecache_work(struct net *net)

{

#ifdef CONFIG_NF_CONNTRACK_EVENTS

	if (net->ct.ecache_dwork_pending) {

		net->ct.ecache_dwork_pending = false;

		mod_delayed_work(system_wq, &net->ct.ecache_dwork, 0);

	}

#endif

}

#endif /* CONFIG_NF_CONNTRACK_EVENTS */



#endif /*_NF_CONNTRACK_ECACHE_H*/