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

Commit c3bc7cff authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NET_SCHED]: Kill CONFIG_NET_CLS_POLICE 



The NET_CLS_ACT option is now a full replacement for NET_CLS_POLICE,
remove the old code. The config option will be kept around to select
the equivalent NET_CLS_ACT options for a short time to allow easier
upgrades.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 73ca4918

include/net/act_api.h

+0 −30
Original line number Diff line number Diff line
@@ -121,34 +121,4 @@ extern int tcf_action_dump_old(struct sk_buff *skb, struct tc_action *a, int, in 
extern int tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int, int);

extern int tcf_action_copy_stats (struct sk_buff *,struct tc_action *, int);

#endif /* CONFIG_NET_CLS_ACT */



extern int tcf_police(struct sk_buff *skb, struct tcf_police *p);

extern void tcf_police_destroy(struct tcf_police *p);

extern struct tcf_police * tcf_police_locate(struct rtattr *rta, struct rtattr *est);

extern int tcf_police_dump(struct sk_buff *skb, struct tcf_police *p);

extern int tcf_police_dump_stats(struct sk_buff *skb, struct tcf_police *p);



static inline int

tcf_police_release(struct tcf_police *p, int bind)

{

	int ret = 0;

#ifdef CONFIG_NET_CLS_ACT

	if (p) {

		if (bind)

			p->tcf_bindcnt--;



		p->tcf_refcnt--;

		if (p->tcf_refcnt <= 0 && !p->tcf_bindcnt) {

			tcf_police_destroy(p);

			ret = 1;

		}

	}

#else

	if (p && --p->tcf_refcnt == 0)

		tcf_police_destroy(p);



#endif /* CONFIG_NET_CLS_ACT */

	return ret;

}



#endif

include/net/pkt_cls.h

+0 −8
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ struct tcf_exts 
{

#ifdef CONFIG_NET_CLS_ACT

	struct tc_action *action;

#elif defined CONFIG_NET_CLS_POLICE

	struct tcf_police *police;

#endif

};
@@ -91,8 +89,6 @@ tcf_exts_is_predicative(struct tcf_exts *exts) 
{

#ifdef CONFIG_NET_CLS_ACT

	return !!exts->action;

#elif defined CONFIG_NET_CLS_POLICE

	return !!exts->police;

#else

	return 0;

#endif
@@ -129,11 +125,7 @@ tcf_exts_exec(struct sk_buff *skb, struct tcf_exts *exts, 
#ifdef CONFIG_NET_CLS_ACT

	if (exts->action)

		return tcf_action_exec(skb, exts->action, res);

#elif defined CONFIG_NET_CLS_POLICE

	if (exts->police)

		return tcf_police(skb, exts->police);

#endif



	return 0;

}

include/net/sch_generic.h

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static inline int qdisc_reshape_fail(struct sk_buff *skb, struct Qdisc *sch) 
{

	sch->qstats.drops++;



#if defined(CONFIG_NET_CLS_ACT) || defined(CONFIG_NET_CLS_POLICE)

#ifdef CONFIG_NET_CLS_ACT

	if (sch->reshape_fail == NULL || sch->reshape_fail(skb, sch))

		goto drop;

net/sched/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -472,12 +472,12 @@ config NET_ACT_SIMP 


config NET_CLS_POLICE

	bool "Traffic Policing (obsolete)"

	depends on NET_CLS_ACT!=y

	select NET_CLS_ACT

	select NET_ACT_POLICE

	---help---

	  Say Y here if you want to do traffic policing, i.e. strict

	  bandwidth limiting. This option is obsoleted by the traffic

	  policer implemented as action, it stays here for compatibility

	  reasons.

	  bandwidth limiting. This option is obsolete and just selects

	  the option replacing it. It will be removed in the future.



config NET_CLS_IND

	bool "Incoming device classification"

net/sched/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ obj-$(CONFIG_NET_SCHED) += sch_api.o sch_blackhole.o 
obj-$(CONFIG_NET_CLS)		+= cls_api.o

obj-$(CONFIG_NET_CLS_ACT)	+= act_api.o

obj-$(CONFIG_NET_ACT_POLICE)	+= act_police.o

obj-$(CONFIG_NET_CLS_POLICE)	+= act_police.o

obj-$(CONFIG_NET_ACT_GACT)	+= act_gact.o

obj-$(CONFIG_NET_ACT_MIRRED)	+= act_mirred.o

obj-$(CONFIG_NET_ACT_IPT)	+= act_ipt.o