From patchwork Mon Jul 24 10:25:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kubalewski, Arkadiusz" X-Patchwork-Id: 13324319 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E7448C00 for ; Mon, 24 Jul 2023 10:28:32 +0000 (UTC) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE3552D77 for ; Mon, 24 Jul 2023 03:28:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690194491; x=1721730491; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OFPPGiE5E6KANkHhVo9zWQGlpzHFo1MlptJ63DYv8nA=; b=DHc5nIXqhDaeF+j7arhNONy8KSTqjWoipkCUytJEZ0CXBZ2QyHeez96o sBMcQBo5MtOyd5I9igobphKHUEJQz2o8qyd2Cv3r+VVsZq92O2/ylFZOK 6x6HStFmPHjWEBUaLhVJ6UqM4k34wkDA5pOqa4sLOKPUyUZqJYqED1XJY Zdednp8dIpekG90Qvx/jYou+MW/yEV6bYFstEESoKeuf8nbKDwkGbVaFR DatHC4QjLsqwo25aqGLEN3q5ulmrodldcONZxHEr0Uc0qPUArkXSHxpnB rD5JnFX8rjtRz/2MEaPjus2lVtHLgiS9dpUgb9ynPg4MHDQhfDlkPg1Ws A==; X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="431200805" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="431200805" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2023 03:27:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="719630840" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="719630840" Received: from amlin-018-114.igk.intel.com ([10.102.18.114]) by orsmga007.jf.intel.com with ESMTP; 24 Jul 2023 03:27:38 -0700 From: Arkadiusz Kubalewski To: kuba@kernel.org, donald.hunter@gmail.com, netdev@vger.kernel.org, davem@davemloft.net, pabeni@redhat.com, edumazet@google.com Cc: simon.horman@corigine.com, Arkadiusz Kubalewski Subject: [PATCH net-next v4 1/2] tools: ynl-gen: fix enum index in _decode_enum(..) Date: Mon, 24 Jul 2023 12:25:20 +0200 Message-Id: <20230724102521.259545-2-arkadiusz.kubalewski@intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230724102521.259545-1-arkadiusz.kubalewski@intel.com> References: <20230724102521.259545-1-arkadiusz.kubalewski@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org Remove wrong index adjustment, which is leftover from adding support for sparse enums. enum.entries_by_val() function shall not subtract the start-value, as it is indexed with real enum value. Fixes: c311aaa74ca1 ("tools: ynl: fix enum-as-flags in the generic CLI") Signed-off-by: Arkadiusz Kubalewski --- tools/net/ynl/lib/ynl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py index 1b3a36fbb1c3..027b1c0aecb4 100644 --- a/tools/net/ynl/lib/ynl.py +++ b/tools/net/ynl/lib/ynl.py @@ -420,8 +420,8 @@ class YnlFamily(SpecFamily): def _decode_enum(self, rsp, attr_spec): raw = rsp[attr_spec['name']] enum = self.consts[attr_spec['enum']] - i = attr_spec.get('value-start', 0) if 'enum-as-flags' in attr_spec and attr_spec['enum-as-flags']: + i = 0 value = set() while raw: if raw & 1: @@ -429,7 +429,7 @@ class YnlFamily(SpecFamily): raw >>= 1 i += 1 else: - value = enum.entries_by_val[raw - i].name + value = enum.entries_by_val[raw].name rsp[attr_spec['name']] = value def _decode_binary(self, attr, attr_spec):