From b2340fbb5ab3a3f37f1290d5ac1d604819e32ffd Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 3 Dec 2019 23:12:00 +0900 Subject: [PATCH] network: SFQ cannot be configured with netem or TBF --- src/network/tc/qdisc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/network/tc/qdisc.c b/src/network/tc/qdisc.c index 717a0cfd38..05c0ebbc18 100644 --- a/src/network/tc/qdisc.c +++ b/src/network/tc/qdisc.c @@ -188,6 +188,8 @@ int qdisc_configure(Link *link, QDisc *qdisc) { } int qdisc_section_verify(QDisc *qdisc, bool *has_root, bool *has_clsact) { + unsigned i; + assert(qdisc); assert(has_root); assert(has_clsact); @@ -195,9 +197,10 @@ int qdisc_section_verify(QDisc *qdisc, bool *has_root, bool *has_clsact) { if (section_is_invalid(qdisc->section)) return -EINVAL; - if (qdisc->has_network_emulator && qdisc->has_token_buffer_filter) + i = qdisc->has_network_emulator + qdisc->has_token_buffer_filter + qdisc->has_stochastic_fairness_queueing; + if (i > 1) return log_warning_errno(SYNTHETIC_ERRNO(EINVAL), - "%s: TrafficControlQueueingDiscipline section has both NetworkEmulator and TokenBufferFilter settings. " + "%s: TrafficControlQueueingDiscipline section has more than one type of discipline. " "Ignoring [TrafficControlQueueingDiscipline] section from line %u.", qdisc->section->filename, qdisc->section->line);