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

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

sched: move tcf_proto_destroy and tcf_destroy_chain helpers into cls_api 



Creation is done in this file, move destruction to be at the same place.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 79112c26

include/net/pkt_cls.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ struct tcf_walker { 
int register_tcf_proto_ops(struct tcf_proto_ops *ops);

int unregister_tcf_proto_ops(struct tcf_proto_ops *ops);



void tcf_destroy_chain(struct tcf_proto __rcu **fl);



static inline unsigned long

__cls_set_class(unsigned long *clp, unsigned long cl)

{

include/net/sch_generic.h

+0 −2
Original line number Diff line number Diff line
@@ -405,8 +405,6 @@ struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue, 
				const struct Qdisc_ops *ops, u32 parentid);

void __qdisc_calculate_pkt_len(struct sk_buff *skb,

			       const struct qdisc_size_table *stab);

bool tcf_proto_destroy(struct tcf_proto *tp, bool force);

void tcf_destroy_chain(struct tcf_proto __rcu **fl);

int skb_do_redirect(struct sk_buff *);



static inline void skb_reset_tc(struct sk_buff *skb)

net/sched/cls_api.c

+21 −0
Original line number Diff line number Diff line
@@ -127,6 +127,27 @@ static inline u32 tcf_auto_prio(struct tcf_proto *tp) 
	return first;

}



static bool tcf_proto_destroy(struct tcf_proto *tp, bool force)

{

	if (tp->ops->destroy(tp, force)) {

		module_put(tp->ops->owner);

		kfree_rcu(tp, rcu);

		return true;

	}

	return false;

}



void tcf_destroy_chain(struct tcf_proto __rcu **fl)

{

	struct tcf_proto *tp;



	while ((tp = rtnl_dereference(*fl)) != NULL) {

		RCU_INIT_POINTER(*fl, tp->next);

		tcf_proto_destroy(tp, true);

	}

}

EXPORT_SYMBOL(tcf_destroy_chain);



/* Add/change/delete/get a filter node */



static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n)

net/sched/sch_api.c

+0 −22
Original line number Diff line number Diff line
@@ -1900,28 +1900,6 @@ int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp, 
}

EXPORT_SYMBOL(tc_classify);



bool tcf_proto_destroy(struct tcf_proto *tp, bool force)

{

	if (tp->ops->destroy(tp, force)) {

		module_put(tp->ops->owner);

		kfree_rcu(tp, rcu);

		return true;

	}



	return false;

}



void tcf_destroy_chain(struct tcf_proto __rcu **fl)

{

	struct tcf_proto *tp;



	while ((tp = rtnl_dereference(*fl)) != NULL) {

		RCU_INIT_POINTER(*fl, tp->next);

		tcf_proto_destroy(tp, true);

	}

}

EXPORT_SYMBOL(tcf_destroy_chain);



#ifdef CONFIG_PROC_FS

static int psched_show(struct seq_file *seq, void *v)

{

net/sched/sch_atm.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/file.h>		/* for fput */

#include <net/netlink.h>

#include <net/pkt_sched.h>

#include <net/pkt_cls.h>



/*

 * The ATM queuing discipline provides a framework for invoking classifiers