iproute2/tc
Jakub Kicinski 44c7655186 tc: fix second printing of requeues
Non-JSON tc qdisc output used to print the "requeues" statistic
twice.  Commit 4fcec7f366 ("tc: jsonify stats2") tried to preserve
this behaviour for both standard output and JSON, but used the wrong
statistic (q.qlen).  Also duplicating keys in JSON is not allowed,
so the second occurrence should be completely skipped with JSON.

Fixes: 4fcec7f366 ("tc: jsonify stats2")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
2018-01-27 16:06:54 -08:00
..
.gitignore Add ignore files to make using git easier 2006-08-08 12:04:38 -07:00
Makefile SPDX license identifiers 2017-11-24 12:21:35 -08:00
e_bpf.c bpf: make tc's bpf loader generic and move into lib 2016-11-29 12:35:32 -08:00
em_canid.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
em_cmp.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
em_ipset.c Convert the obvious cases to strlcpy() 2017-09-01 12:10:54 -07:00
em_meta.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
em_nbyte.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
em_u32.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
emp_ematch.l tc/lexer: let quotes actually start strings 2018-01-24 08:49:10 -08:00
emp_ematch.y tc: remove extra whitespace 2015-10-23 15:43:28 -07:00
f_basic.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
f_bpf.c f_bpf: communicate ifindex for eBPF offload 2017-11-26 11:57:57 -08:00
f_cgroup.c tc actions: Improved batching and time filtered dumping 2017-08-04 13:16:51 -07:00
f_flow.c tc actions: Improved batching and time filtered dumping 2017-08-04 13:16:51 -07:00
f_flower.c tc: jsonify flower filter 2017-11-26 12:20:51 -08:00
f_fw.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
f_matchall.c tc: jsonify matchall filter 2017-11-26 12:20:51 -08:00
f_route.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
f_rsvp.c tc: break long lines 2017-11-24 11:31:36 -08:00
f_tcindex.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
f_u32.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
m_action.c tc: Optimize gact action lookup 2018-01-17 10:27:47 -08:00
m_bpf.c tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() 2017-12-08 10:29:01 -08:00
m_connmark.c tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() 2017-12-08 10:29:01 -08:00
m_csum.c tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() 2017-12-08 10:29:01 -08:00
m_ematch.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
m_ematch.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
m_estimator.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
m_gact.c tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() 2017-12-08 10:29:01 -08:00
m_ife.c tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() 2017-12-08 10:29:01 -08:00
m_ipt.c tc: replace magic constant 16 with #define 2017-11-24 11:19:18 -08:00
m_mirred.c tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() 2017-12-08 10:29:01 -08:00
m_nat.c tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() 2017-12-08 10:29:01 -08:00
m_pedit.c tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() 2017-12-08 10:29:01 -08:00
m_pedit.h drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
m_police.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
m_sample.c tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() 2017-12-08 10:29:01 -08:00
m_simple.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
m_skbedit.c tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() 2017-12-08 10:29:01 -08:00
m_skbmod.c tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() 2017-12-08 10:29:01 -08:00
m_tunnel_key.c tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() 2017-12-08 10:29:01 -08:00
m_vlan.c tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() 2017-12-08 10:29:01 -08:00
m_xt.c tc: replace magic constant 16 with #define 2017-11-24 11:19:18 -08:00
m_xt_old.c tc: replace magic constant 16 with #define 2017-11-24 11:19:18 -08:00
p_eth.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
p_icmp.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
p_ip.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
p_ip6.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
p_tcp.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
p_udp.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
q_atm.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
q_cbq.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
q_cbs.c tc: break long lines 2017-11-24 11:31:36 -08:00
q_choke.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
q_clsact.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
q_codel.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
q_drr.c tc: break long lines 2017-11-24 11:31:36 -08:00
q_dsmark.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
q_fifo.c tc: break long lines 2017-11-24 11:31:36 -08:00
q_fq.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
q_fq_codel.c tc: jsonify fq_codel qdisc 2017-11-26 12:20:51 -08:00
q_gred.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
q_hfsc.c tc: break long lines 2017-11-24 11:31:36 -08:00
q_hhf.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
q_htb.c tc: jsonify htb qdisc 2017-11-26 12:20:51 -08:00
q_ingress.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
q_mqprio.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
q_multiq.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
q_netem.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
q_pie.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
q_prio.c tc: break long lines 2017-11-24 11:31:36 -08:00
q_qfq.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
q_red.c tc: break long lines 2017-11-24 11:31:36 -08:00
q_rr.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
q_sfb.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
q_sfq.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
q_tbf.c tc: break long lines 2017-11-24 11:31:36 -08:00
static-syms.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
tc.c tc: jsonify qdisc core 2017-11-26 12:20:51 -08:00
tc_cbq.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
tc_cbq.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
tc_class.c tc: B.W limits can now be specified in %. 2017-11-24 11:22:13 -08:00
tc_common.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
tc_core.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
tc_core.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
tc_estimator.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
tc_exec.c tc: replace magic constant 16 with #define 2017-11-24 11:19:18 -08:00
tc_filter.c tc: Fix filter protocol output 2018-01-09 08:09:10 -08:00
tc_monitor.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
tc_qdisc.c qdisc: print offload indication 2017-12-27 13:55:16 -08:00
tc_red.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
tc_red.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
tc_stab.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
tc_util.c tc: fix second printing of requeues 2018-01-27 16:06:54 -08:00
tc_util.h tc: Optimize gact action lookup 2018-01-17 10:27:47 -08:00