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

Commit 6fc6d06e authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: sched: remove redundant helpers tcf_exts_is_predicative and tcf_exts_is_available 



These two helpers are doing the same as tcf_exts_has_actions, so remove
them and use tcf_exts_has_actions instead.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent af69afc5

include/net/pkt_cls.h

+0 −30
Original line number Diff line number Diff line
@@ -113,36 +113,6 @@ static inline int tcf_exts_init(struct tcf_exts *exts, int action, int police) 
	return 0;

}



/**

 * tcf_exts_is_predicative - check if a predicative extension is present

 * @exts: tc filter extensions handle

 *

 * Returns 1 if a predicative extension is present, i.e. an extension which

 * might cause further actions and thus overrule the regular tcf_result.

 */

static inline int

tcf_exts_is_predicative(struct tcf_exts *exts)

{

#ifdef CONFIG_NET_CLS_ACT

	return exts->nr_actions;

#else

	return 0;

#endif

}



/**

 * tcf_exts_is_available - check if at least one extension is present

 * @exts: tc filter extensions handle

 *

 * Returns 1 if at least one extension is present.

 */

static inline int

tcf_exts_is_available(struct tcf_exts *exts)

{

	/* All non-predicative extensions must be added here. */

	return tcf_exts_is_predicative(exts);

}



static inline void tcf_exts_to_list(const struct tcf_exts *exts,

				    struct list_head *actions)

{

net/sched/cls_fw.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static int fw_dump(struct net *net, struct tcf_proto *tp, unsigned long fh, 


	t->tcm_handle = f->id;



	if (!f->res.classid && !tcf_exts_is_available(&f->exts))

	if (!f->res.classid && !tcf_exts_has_actions(&f->exts))

		return skb->len;



	nest = nla_nest_start(skb, TCA_OPTIONS);

net/sched/cls_route.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static inline int route4_hash_wild(void) 
#define ROUTE4_APPLY_RESULT()					\

{								\

	*res = f->res;						\

	if (tcf_exts_is_available(&f->exts)) {			\

	if (tcf_exts_has_actions(&f->exts)) {			\

		int r = tcf_exts_exec(skb, &f->exts, res);	\

		if (r < 0) {					\

			dont_cache = 1;				\

net/sched/cls_tcindex.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct tcindex_data { 


static inline int tcindex_filter_is_set(struct tcindex_filter_result *r)

{

	return tcf_exts_is_predicative(&r->exts) || r->res.classid;

	return tcf_exts_has_actions(&r->exts) || r->res.classid;

}



static struct tcindex_filter_result *tcindex_lookup(struct tcindex_data *p,