From nobody Mon Apr 6 21:57:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0D6BC54EE9 for ; Fri, 2 Sep 2022 11:23:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236006AbiIBLXR (ORCPT ); Fri, 2 Sep 2022 07:23:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235657AbiIBLWl (ORCPT ); Fri, 2 Sep 2022 07:22:41 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48671C7B97; Fri, 2 Sep 2022 04:22:40 -0700 (PDT) Received: from dggpeml500026.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4MJwSw5d0zzrS3Z; Fri, 2 Sep 2022 19:20:48 +0800 (CST) Received: from huawei.com (10.175.101.6) by dggpeml500026.china.huawei.com (7.185.36.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 2 Sep 2022 19:22:37 +0800 From: Zhengchao Shao To: , , , , , , , , , , CC: , , , , , , , , , , , , Subject: [PATCH net-next 08/22] net: sched: act_gate: get rid of tcf_gate_walker and tcf_gate_search Date: Fri, 2 Sep 2022 19:24:32 +0800 Message-ID: <20220902112446.29858-9-shaozhengchao@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220902112446.29858-1-shaozhengchao@huawei.com> References: <20220902112446.29858-1-shaozhengchao@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml500026.china.huawei.com (7.185.36.106) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use __tcf_generic_walker() and __tcf_idr_search() helpers by saving gate_net_id when registering act_gate_ops. And then remove the walk and lookup hook functions in act_gate. Signed-off-by: Zhengchao Shao --- net/sched/act_gate.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/net/sched/act_gate.c b/net/sched/act_gate.c index fd5155274733..e347e3b42a14 100644 --- a/net/sched/act_gate.c +++ b/net/sched/act_gate.c @@ -565,15 +565,6 @@ static int tcf_gate_dump(struct sk_buff *skb, struct t= c_action *a, return -1; } =20 -static int tcf_gate_walker(struct net *net, struct sk_buff *skb, - struct netlink_callback *cb, int type, - const struct tc_action_ops *ops, - struct netlink_ext_ack *extack) -{ - struct tc_action_net *tn =3D net_generic(net, gate_net_id); - - return tcf_generic_walker(tn, skb, cb, type, ops, extack); -} =20 static void tcf_gate_stats_update(struct tc_action *a, u64 bytes, u64 pack= ets, u64 drops, u64 lastuse, bool hw) @@ -585,13 +576,6 @@ static void tcf_gate_stats_update(struct tc_action *a,= u64 bytes, u64 packets, tm->lastuse =3D max_t(u64, tm->lastuse, lastuse); } =20 -static int tcf_gate_search(struct net *net, struct tc_action **a, u32 inde= x) -{ - struct tc_action_net *tn =3D net_generic(net, gate_net_id); - - return tcf_idr_search(tn, a, index); -} - static size_t tcf_gate_get_fill_size(const struct tc_action *act) { return nla_total_size(sizeof(struct tc_gate)); @@ -649,15 +633,14 @@ static int tcf_gate_offload_act_setup(struct tc_actio= n *act, void *entry_data, static struct tc_action_ops act_gate_ops =3D { .kind =3D "gate", .id =3D TCA_ID_GATE, + .net_id =3D &gate_net_id, .owner =3D THIS_MODULE, .act =3D tcf_gate_act, .dump =3D tcf_gate_dump, .init =3D tcf_gate_init, .cleanup =3D tcf_gate_cleanup, - .walk =3D tcf_gate_walker, .stats_update =3D tcf_gate_stats_update, .get_fill_size =3D tcf_gate_get_fill_size, - .lookup =3D tcf_gate_search, .offload_act_setup =3D tcf_gate_offload_act_setup, .size =3D sizeof(struct tcf_gate), }; --=20 2.17.1