mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-22 02:20:40 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Jakub Kicinski 2022-08-31 19:39:56 -07:00
commit 744ccd5c64
4 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/net/red.h
View file

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

2
net/sched/sch_choke.c
View file

@ -60,7 +60,6 @@ struct choke_sched_data {
u32 forced_drop; /* Forced drops, qavg > max_thresh */ u32 forced_drop; /* Forced drops, qavg > max_thresh */
u32 forced_mark; /* Forced marks, qavg > max_thresh */ u32 forced_mark; /* Forced marks, qavg > max_thresh */
u32 pdrop; /* Drops due to queue limits */ u32 pdrop; /* Drops due to queue limits */
u32 other; /* Drops due to drop() calls */
u32 matched; /* Drops to flow match */ u32 matched; /* Drops to flow match */
} stats; } 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, .early = q->stats.prob_drop + q->stats.forced_drop,
.marked = q->stats.prob_mark + q->stats.forced_mark, .marked = q->stats.prob_mark + q->stats.forced_mark,
.pdrop = q->stats.pdrop, .pdrop = q->stats.pdrop,
.other = q->stats.other,
.matched = q->stats.matched, .matched = q->stats.matched,
}; };

3
net/sched/sch_gred.c
View file

@ -829,7 +829,6 @@ static int gred_dump(struct Qdisc *sch, struct sk_buff *skb)
opt.Wlog = q->parms.Wlog; opt.Wlog = q->parms.Wlog;
opt.Plog = q->parms.Plog; opt.Plog = q->parms.Plog;
opt.Scell_log = q->parms.Scell_log; opt.Scell_log = q->parms.Scell_log;
opt.other = q->stats.other;
opt.early = q->stats.prob_drop; opt.early = q->stats.prob_drop;
opt.forced = q->stats.forced_drop; opt.forced = q->stats.forced_drop;
opt.pdrop = q->stats.pdrop; opt.pdrop = q->stats.pdrop;
@ -895,8 +894,6 @@ static int gred_dump(struct Qdisc *sch, struct sk_buff *skb)
goto nla_put_failure; goto nla_put_failure;
if (nla_put_u32(skb, TCA_GRED_VQ_STAT_PDROP, q->stats.pdrop)) if (nla_put_u32(skb, TCA_GRED_VQ_STAT_PDROP, q->stats.pdrop))
goto nla_put_failure; 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); nla_nest_end(skb, vq);
} }

1
net/sched/sch_red.c
View file

@ -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.early = q->stats.prob_drop + q->stats.forced_drop;
st.pdrop = q->stats.pdrop; st.pdrop = q->stats.pdrop;
st.other = q->stats.other;
st.marked = q->stats.prob_mark + q->stats.forced_mark; st.marked = q->stats.prob_mark + q->stats.forced_mark;
return gnet_stats_copy_app(d, &st, sizeof(st)); return gnet_stats_copy_app(d, &st, sizeof(st));