pkt_sched: sch_hfsc: sch_htb: Add non-work-conserving warning handler.
Patrick McHardy <kaber@trash.net> suggested: > How about making this flag and the warning message (in a out-of-line > function) globally available? Other qdiscs (f.i. HFSC) can't deal with > inner non-work-conserving qdiscs as well. This patch uses qdisc->flags field of "suspected" child qdisc. Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -887,8 +887,7 @@ qdisc_peek_len(struct Qdisc *sch)
|
||||
|
||||
skb = sch->ops->peek(sch);
|
||||
if (skb == NULL) {
|
||||
if (net_ratelimit())
|
||||
printk("qdisc_peek_len: non work-conserving qdisc ?\n");
|
||||
qdisc_warn_nonwc("qdisc_peek_len", sch);
|
||||
return 0;
|
||||
}
|
||||
len = qdisc_pkt_len(skb);
|
||||
@@ -1642,8 +1641,7 @@ hfsc_dequeue(struct Qdisc *sch)
|
||||
|
||||
skb = qdisc_dequeue_peeked(cl->qdisc);
|
||||
if (skb == NULL) {
|
||||
if (net_ratelimit())
|
||||
printk("HFSC: Non-work-conserving qdisc ?\n");
|
||||
qdisc_warn_nonwc("HFSC", cl->qdisc);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user