lkml.org 
[lkml]   [2022]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH net-next] net: sched: remove unnecessary init of qidsc skb head
Date
The memory allocated by using kzallloc_node and kcalloc has been cleared.
Therefore, the structure members of the new qdisc are 0. So there's no
need to explicitly assign a value of 0.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
include/net/sch_generic.h | 7 -------
net/sched/sch_generic.c | 1 -
net/sched/sch_htb.c | 2 --
3 files changed, 10 deletions(-)

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index ec693fe7c553..dcdb8474ed68 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -940,13 +940,6 @@ static inline void qdisc_purge_queue(struct Qdisc *sch)
qdisc_tree_reduce_backlog(sch, qlen, backlog);
}

-static inline void qdisc_skb_head_init(struct qdisc_skb_head *qh)
-{
- qh->head = NULL;
- qh->tail = NULL;
- qh->qlen = 0;
-}
-
static inline void __qdisc_enqueue_tail(struct sk_buff *skb,
struct qdisc_skb_head *qh)
{
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index d47b9689eba6..0c0f20f7b9f5 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -941,7 +941,6 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
goto errout;
__skb_queue_head_init(&sch->gso_skb);
__skb_queue_head_init(&sch->skb_bad_txq);
- qdisc_skb_head_init(&sch->q);
gnet_stats_basic_sync_init(&sch->bstats);
spin_lock_init(&sch->q.lock);

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 23a9d6242429..f43414e42ad5 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1106,8 +1106,6 @@ static int htb_init(struct Qdisc *sch, struct nlattr *opt,
if (err < 0)
goto err_free_direct_qdiscs;

- qdisc_skb_head_init(&q->direct_queue);
-
if (tb[TCA_HTB_DIRECT_QLEN])
q->direct_qlen = nla_get_u32(tb[TCA_HTB_DIRECT_QLEN]);
else
--
2.17.1
\
 
 \ /
  Last update: 2022-08-24 11:08    [W:0.051 / U:0.260 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site