net: sched: gred/red: remove unused variables in struct red_stats

The variable "other" in the struct red_stats is not used. Remove it.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/red.h b/include/net/red.h
index be11dbd..454ac2b 100644 (file)
--- a/include/net/red.h
+++ b/include/net/red.h
@@ -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 {

diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index 1073c76..e7af53f 100644 (file)
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -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 @@ append_opt:
                        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);
        }

diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c
index f1e013e..f7ac40c 100644 (file)
--- a/net/sched/sch_red.c
+++ b/net/sched/sch_red.c
@@ -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));