| Message ID | 20231023064729.370649-1-liujian56@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6d25d1dc76bf5943a5c1f4bb74d66d5eac58eb77 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: sched: sch_qfq: Use non-work-conserving warning handler | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Paolo Abeni <pabeni@redhat.com>: On Mon, 23 Oct 2023 14:47:29 +0800 you wrote: > A helper function for printing non-work-conserving alarms is added in > commit b00355db3f88 ("pkt_sched: sch_hfsc: sch_htb: Add non-work-conserving > warning handler."). In this commit, use qdisc_warn_nonwc() instead of > WARN_ONCE() to handle the non-work-conserving warning in qfq Qdisc. > > Signed-off-by: Liu Jian <liujian56@huawei.com> > > [...] Here is the summary with links: - [net-next] net: sched: sch_qfq: Use non-work-conserving warning handler https://git.kernel.org/netdev/net-next/c/6d25d1dc76bf You are awesome, thank you!
diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c index 546c10adcacd..5598f8be18ae 100644 --- a/net/sched/sch_qfq.c +++ b/net/sched/sch_qfq.c @@ -1003,7 +1003,7 @@ static inline struct sk_buff *qfq_peek_skb(struct qfq_aggregate *agg, *cl = list_first_entry(&agg->active, struct qfq_class, alist); skb = (*cl)->qdisc->ops->peek((*cl)->qdisc); if (skb == NULL) - WARN_ONCE(1, "qfq_dequeue: non-workconserving leaf\n"); + qdisc_warn_nonwc("qfq_dequeue", (*cl)->qdisc); else *len = qdisc_pkt_len(skb);
A helper function for printing non-work-conserving alarms is added in commit b00355db3f88 ("pkt_sched: sch_hfsc: sch_htb: Add non-work-conserving warning handler."). In this commit, use qdisc_warn_nonwc() instead of WARN_ONCE() to handle the non-work-conserving warning in qfq Qdisc. Signed-off-by: Liu Jian <liujian56@huawei.com> --- net/sched/sch_qfq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)