lkml.org 
[lkml]   [2022]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH net-next,v2 1/3] net: sched: choke: remove unused variables in struct choke_sched_data
From


On 2022/8/30 1:08, Eric Dumazet wrote:
> On Mon, Aug 29, 2022 at 1:14 AM Zhengchao Shao <shaozhengchao@huawei.com> wrote:
>>
>> The variable "other" in the struct choke_sched_data is not used. Remove it.
>>
>> Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
>> ---
>> v1: qdisc_drop() already counts drops, unnecessary to use "other" to duplicate the same information.
>> ---
>> include/uapi/linux/pkt_sched.h | 1 -
>> net/sched/sch_choke.c | 2 --
>> 2 files changed, 3 deletions(-)
>>
>> diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
>> index f292b467b27f..32d49447cc7a 100644
>> --- a/include/uapi/linux/pkt_sched.h
>> +++ b/include/uapi/linux/pkt_sched.h
>> @@ -396,7 +396,6 @@ struct tc_choke_qopt {
>> struct tc_choke_xstats {
>> __u32 early; /* Early drops */
>> __u32 pdrop; /* Drops due to queue limits */
>> - __u32 other; /* Drops due to drop() calls */
>
> You can not remove a field in UAPI.
>
>> __u32 marked; /* Marked packets */
>> __u32 matched; /* Drops due to flow match */
>> };
>> diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
>> index 25d2daaa8122..3ac3e5c80b6f 100644
>> --- a/net/sched/sch_choke.c
>> +++ b/net/sched/sch_choke.c
>> @@ -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,
>> };
>>
>> --
>> 2.17.1
>>

Hi Eric:
Thanks for the heads up. I'll pay attention in the future.

Zhengchao Shao

\
 
 \ /
  Last update: 2022-08-30 02:46    [W:0.055 / U:0.484 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site