Commit 744ccd5c authored Aug 31, 2022 by Jakub Kicinski

Merge branch 'net-sched-remove-unused-variables'

Zhengchao Shao says:

====================
net: sched: remove unused variables

The variable "other" is unused, remove it.
====================

Link: https://lore.kernel.org/r/20220830092255.281330-1-shaozhengchao@huawei.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents cb45a8bf 4516c873

include/net/red.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -122,7 +122,6 @@ struct red_stats {
		u32 forced_drop; /* Forced drops, qavg > max_thresh */
		u32 forced_mark; /* Forced marks, qavg > max_thresh */
		u32 pdrop; /* Drops due to queue limits */
		u32 other; /* Drops due to drop() calls */
		};

		struct red_parms {

net/sched/sch_choke.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ struct choke_sched_data {
		u32 forced_drop; /* Forced drops, qavg > max_thresh */
		u32 forced_mark; /* Forced marks, qavg > max_thresh */
		u32 pdrop; /* Drops due to queue limits */
		u32 other; /* Drops due to drop() calls */
		u32 matched; /* Drops to flow match */
		} stats;

		@@ -464,7 +463,6 @@ static int choke_dump_stats(struct Qdisc sch, struct gnet_dump d)
		.early = q->stats.prob_drop + q->stats.forced_drop,
		.marked = q->stats.prob_mark + q->stats.forced_mark,
		.pdrop = q->stats.pdrop,
		.other = q->stats.other,
		.matched = q->stats.matched,
		};

net/sched/sch_gred.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -829,7 +829,6 @@ static int gred_dump(struct Qdisc sch, struct sk_buff skb)
		opt.Wlog = q->parms.Wlog;
		opt.Plog = q->parms.Plog;
		opt.Scell_log = q->parms.Scell_log;
		opt.other = q->stats.other;
		opt.early = q->stats.prob_drop;
		opt.forced = q->stats.forced_drop;
		opt.pdrop = q->stats.pdrop;
		@@ -895,8 +894,6 @@ static int gred_dump(struct Qdisc sch, struct sk_buff skb)
		goto nla_put_failure;
		if (nla_put_u32(skb, TCA_GRED_VQ_STAT_PDROP, q->stats.pdrop))
		goto nla_put_failure;
		if (nla_put_u32(skb, TCA_GRED_VQ_STAT_OTHER, q->stats.other))
		goto nla_put_failure;

		nla_nest_end(skb, vq);
		}

net/sched/sch_red.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -461,7 +461,6 @@ static int red_dump_stats(struct Qdisc sch, struct gnet_dump d)
		}
		st.early = q->stats.prob_drop + q->stats.forced_drop;
		st.pdrop = q->stats.pdrop;
		st.other = q->stats.other;
		st.marked = q->stats.prob_mark + q->stats.forced_mark;

		return gnet_stats_copy_app(d, &st, sizeof(st));