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

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

net_sched: remove internal use of TC_POLICE_* 



These should be gone when we removed CONFIG_NET_CLS_POLICE.
We can not totally remove them since they are exposed
to userspace.

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 161cd45f

net/sched/act_ipt.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static int tcf_ipt(struct sk_buff *skb, const struct tc_action *a, 
	default:

		net_notice_ratelimited("tc filter: Bogus netfilter code %d assume ACCEPT\n",

				       ret);

		result = TC_POLICE_OK;

		result = TC_ACT_OK;

		break;

	}

	spin_unlock(&ipt->tcf_lock);

net/sched/sch_atm.c

+2 −2
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
	int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;



	pr_debug("atm_tc_enqueue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p);

	result = TC_POLICE_OK;	/* be nice to gcc */

	result = TC_ACT_OK;	/* be nice to gcc */

	flow = NULL;

	if (TC_H_MAJ(skb->priority) != sch->handle ||

	    !(flow = (struct atm_flow_data *)atm_tc_get(sch, skb->priority))) {
@@ -403,7 +403,7 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
		case TC_ACT_SHOT:

			kfree_skb(skb);

			goto drop;

		case TC_POLICE_RECLASSIFY:

		case TC_ACT_RECLASSIFY:

			if (flow->excess)

				flow = flow->excess;

			else