From mboxrd@z Thu Jan 1 00:00:00 1970 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 AE0B9C636D3 for ; Tue, 31 Jan 2023 02:34:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230154AbjAaCef (ORCPT ); Mon, 30 Jan 2023 21:34:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230186AbjAaCeQ (ORCPT ); Mon, 30 Jan 2023 21:34:16 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFD243668D; Mon, 30 Jan 2023 18:34:05 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0B763B818F2; Tue, 31 Jan 2023 02:34:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C558C433A1; Tue, 31 Jan 2023 02:34:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675132442; bh=AgNHGmz/pHx5tPRVf5ALTdu81co3nVwX1T5nzqRfS9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u2zKi9o8eXN0yur22Q9mhLFheBXpAHiGib8B+fMcPRY57O/4+jhEZHcDh2xXeHWG2 E8UzuPqEZMj3mTBygk0thFOFWhMrmV2zHKu7zsf2g3LYX7njqDqXnwaOVPbgSQxfM1 9DTdmxUPaiuUh9x2j3/Vw0YDoP30hZn6pj2KzDgcQwhMjkr0LuMBdeVUnSAmnLNyjk KhQk72zf9dOKgw95501R8ov1valAPekzmmwUHKDrhdWDZzpMB6P7KD2FacW8UgEDqt dAMoWPx6WTcaDj+owsgEHKCVFQE4Qzp5tKExLq8UZtT/jHoTRH5ArNaenBxrZsHcYK hIzCROSJLwGbg== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, sdf@google.com, linux-doc@vger.kernel.org, Jakub Kicinski Subject: [PATCH net-next v2 06/14] tools: ynl: support directional enum-model in CLI Date: Mon, 30 Jan 2023 18:33:46 -0800 Message-Id: <20230131023354.1732677-7-kuba@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230131023354.1732677-1-kuba@kernel.org> References: <20230131023354.1732677-1-kuba@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Support families which use different IDs for messages to and from the kernel. Signed-off-by: Jakub Kicinski --- tools/net/ynl/lib/ynl.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py index a656b655d302..690065003935 100644 --- a/tools/net/ynl/lib/ynl.py +++ b/tools/net/ynl/lib/ynl.py @@ -313,7 +313,7 @@ genl_family_name_to_id = None for msg in self.msgs.values(): if msg.is_async: - self.async_msg_ids.add(msg.value) + self.async_msg_ids.add(msg.rsp_value) for op_name, op in self.ops.items(): bound_f = functools.partial(self._op, op_name) @@ -398,7 +398,7 @@ genl_family_name_to_id = None if self.include_raw: msg['nlmsg'] = nl_msg msg['genlmsg'] = genl_msg - op = self.msgs_by_value[genl_msg.genl_cmd] + op = self.rsp_by_value[genl_msg.genl_cmd] msg['name'] = op['name'] msg['msg'] = self._decode(genl_msg.raw_attrs, op.attr_set.name) self.async_msg_queue.append(msg) @@ -435,7 +435,7 @@ genl_family_name_to_id = None nl_flags |= Netlink.NLM_F_DUMP req_seq = random.randint(1024, 65535) - msg = _genl_msg(self.family.family_id, nl_flags, op.value, 1, req_seq) + msg = _genl_msg(self.family.family_id, nl_flags, op.req_value, 1, req_seq) for name, value in vals.items(): msg += self._add_attr(op.attr_set.name, name, value) msg = _genl_msg_finalize(msg) @@ -458,7 +458,7 @@ genl_family_name_to_id = None gm = GenlMsg(nl_msg) # Check if this is a reply to our request - if nl_msg.nl_seq != req_seq or gm.genl_cmd != op.value: + if nl_msg.nl_seq != req_seq or gm.genl_cmd != op.rsp_value: if gm.genl_cmd in self.async_msg_ids: self.handle_ntf(nl_msg, gm) continue -- 2.39.1