| Message ID | 20220824091003.15935-1-shaozhengchao@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 44387d1736c40a74085be354e2b5f37ca0689608 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: sched: remove unnecessary init of qidsc skb head | expand |
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Wed, 24 Aug 2022 17:10:03 +0800 you wrote: > 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(-) Here is the summary with links: - [net-next] net: sched: remove unnecessary init of qidsc skb head https://git.kernel.org/netdev/net-next/c/44387d1736c4 You are awesome, thank you!
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
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(-)