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

Commit b2313077 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

net_sched: make tcf_hash_check() boolean 



Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6e225ca

include/net/act_api.h

+2 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ int tcf_generic_walker(struct tc_action_net *tn, struct sk_buff *skb, 
		       struct tc_action *a);

int tcf_hash_search(struct tc_action_net *tn, struct tc_action *a, u32 index);

u32 tcf_hash_new_index(struct tc_action_net *tn);

int tcf_hash_check(struct tc_action_net *tn, u32 index, struct tc_action *a,

bool tcf_hash_check(struct tc_action_net *tn, u32 index, struct tc_action *a,

		    int bind);

int tcf_hash_create(struct tc_action_net *tn, u32 index, struct nlattr *est,

		    struct tc_action *a, int size, int bind, bool cpustats);

net/sched/act_api.c

+4 −4
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ int tcf_hash_search(struct tc_action_net *tn, struct tc_action *a, u32 index) 
}

EXPORT_SYMBOL(tcf_hash_search);



int tcf_hash_check(struct tc_action_net *tn, u32 index, struct tc_action *a,

bool tcf_hash_check(struct tc_action_net *tn, u32 index, struct tc_action *a,

		    int bind)

{

	struct tcf_hashinfo *hinfo = tn->hinfo;
@@ -235,9 +235,9 @@ int tcf_hash_check(struct tc_action_net *tn, u32 index, struct tc_action *a, 
		p->tcfc_refcnt++;

		a->priv = p;

		a->hinfo = hinfo;

		return 1;

		return true;

	}

	return 0;

	return false;

}

EXPORT_SYMBOL(tcf_hash_check);

net/sched/act_ife.c

+2 −1
Original line number Diff line number Diff line
@@ -423,7 +423,8 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla, 
	u16 ife_type = 0;

	u8 *daddr = NULL;

	u8 *saddr = NULL;

	int ret = 0, exists = 0;

	bool exists = false;

	int ret = 0;

	int err;



	err = nla_parse_nested(tb, TCA_IFE_MAX, nla, ife_policy);

net/sched/act_ipt.c

+2 −1
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ static int __tcf_ipt_init(struct tc_action_net *tn, struct nlattr *nla, 
	struct tcf_ipt *ipt;

	struct xt_entry_target *td, *t;

	char *tname;

	int ret = 0, err, exists = 0;

	bool exists = false;

	int ret = 0, err;

	u32 hook = 0;

	u32 index = 0;

net/sched/act_mirred.c

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla, 
	struct tc_mirred *parm;

	struct tcf_mirred *m;

	struct net_device *dev;

	int ret, ok_push = 0, exists = 0;

	int ret, ok_push = 0;

	bool exists = false;



	if (nla == NULL)

		return -EINVAL;