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

Commit 29f1df6c authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

[PKT_SCHED]: Fix qdisc return code. 



The mapping between TC_ACTION_SHOT and the qdisc return codes is better
suited to NET_XMIT_BYPASS so as not to confuse TCP

Signed-off-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 253af423

net/sched/sch_cbq.c

+2 −2
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ cbq_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr) 
	    (cl = cbq_class_lookup(q, prio)) != NULL)

		return cl;



	*qerr = NET_XMIT_DROP;

	*qerr = NET_XMIT_BYPASS;

	for (;;) {

		int result = 0;

		defmap = head->defaults;
@@ -413,7 +413,7 @@ cbq_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
	q->rx_class = cl;

#endif

	if (cl == NULL) {

		if (ret == NET_XMIT_DROP)

		if (ret == NET_XMIT_BYPASS)

			sch->qstats.drops++;

		kfree_skb(skb);

		return ret;

net/sched/sch_hfsc.c

+2 −2
Original line number Diff line number Diff line
@@ -1227,7 +1227,7 @@ hfsc_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr) 
		if (cl->level == 0)

			return cl;



	*qerr = NET_XMIT_DROP;

	*qerr = NET_XMIT_BYPASS;

	tcf = q->root.filter_list;

	while (tcf && (result = tc_classify(skb, tcf, &res)) >= 0) {

#ifdef CONFIG_NET_CLS_ACT
@@ -1643,7 +1643,7 @@ hfsc_enqueue(struct sk_buff *skb, struct Qdisc *sch) 


	cl = hfsc_classify(skb, sch, &err);

	if (cl == NULL) {

		if (err == NET_XMIT_DROP)

		if (err == NET_XMIT_BYPASS)

			sch->qstats.drops++;

		kfree_skb(skb);

		return err;

net/sched/sch_htb.c

+2 −2
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch, in 
	if ((cl = htb_find(skb->priority,sch)) != NULL && cl->level == 0) 

		return cl;



	*qerr = NET_XMIT_DROP;

	*qerr = NET_XMIT_BYPASS;

	tcf = q->filter_list;

	while (tcf && (result = tc_classify(skb, tcf, &res)) >= 0) {

#ifdef CONFIG_NET_CLS_ACT
@@ -724,7 +724,7 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
	}

#ifdef CONFIG_NET_CLS_ACT

    } else if (!cl) {

	if (ret == NET_XMIT_DROP)

	if (ret == NET_XMIT_BYPASS)

		sch->qstats.drops++;

	kfree_skb (skb);

	return ret;

net/sched/sch_prio.c

+4 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr) 
	u32 band = skb->priority;

	struct tcf_result res;



	*qerr = NET_XMIT_DROP;

	*qerr = NET_XMIT_BYPASS;

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

#ifdef CONFIG_NET_CLS_ACT

		switch (tc_classify(skb, q->filter_list, &res)) {
@@ -91,7 +91,8 @@ prio_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
	qdisc = prio_classify(skb, sch, &ret);

#ifdef CONFIG_NET_CLS_ACT

	if (qdisc == NULL) {

		if (ret == NET_XMIT_DROP)



		if (ret == NET_XMIT_BYPASS)

			sch->qstats.drops++;

		kfree_skb(skb);

		return ret;
@@ -118,7 +119,7 @@ prio_requeue(struct sk_buff *skb, struct Qdisc* sch) 
	qdisc = prio_classify(skb, sch, &ret);

#ifdef CONFIG_NET_CLS_ACT

	if (qdisc == NULL) {

		if (ret == NET_XMIT_DROP)

		if (ret == NET_XMIT_BYPASS)

			sch->qstats.drops++;

		kfree_skb(skb);

		return ret;