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

Commit b36f997a authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Greg Kroah-Hartman
Browse files

net_sched: blackhole: tell upper qdisc about dropped packets 



[ Upstream commit 7e85dc8cb35abf16455f1511f0670b57c1a84608 ]

When blackhole is used on top of classful qdisc like hfsc it breaks
qlen and backlog counters because packets are disappear without notice.

In HFSC non-zero qlen while all classes are inactive triggers warning:
WARNING: ... at net/sched/sch_hfsc.c:1393 hfsc_dequeue+0xba4/0xe90 [sch_hfsc]
and schedules watchdog work endlessly.

This patch return __NET_XMIT_BYPASS in addition to NET_XMIT_SUCCESS,
this flag tells upper layer: this packet is gone and isn't queued.

Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5e6b4b9b

net/sched/sch_blackhole.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static int blackhole_enqueue(struct sk_buff *skb, struct Qdisc *sch, 
			     struct sk_buff **to_free)

{

	qdisc_drop(skb, sch, to_free);

	return NET_XMIT_SUCCESS;

	return NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;

}



static struct sk_buff *blackhole_dequeue(struct Qdisc *sch)