From patchwork Tue Feb 11 12:01:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Donald Hunter X-Patchwork-Id: 864406 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EA491FA165; Tue, 11 Feb 2025 12:01:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739275304; cv=none; b=rCNguLuMK/8ceVV1Fv2mnTDx4FLBoQ5IPcFoQurBS95jWrmZofYwsq5ophGrAmVvo1JuLtBAqOZrBR0ETa0UJAxpvIG/YaGfV9w6QZQ4pU+TZTaLnhoC9LHdgVleZ2d8vg8zT9OFB1TRD3UiaQDGFbGMFNOMrdGwsX1MuJhqUKQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739275304; c=relaxed/simple; bh=WSmza9m5lqfjaJbkYShhNi8pvsDhRW/0u6ShwBBGN1E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AmAZ4s8LXBZYXs/jnTxfXVEXFFtgCNLI4nuORCG69e+0qe0lT236pano5aItzTNAqQrhhtjfg1Y5vP7NhmaUtUrBLShzaVvTKVaLSx/4SKOLknWVryhI8Sra7pzn0n4a3jwkrOA8dTaN1Lip+eYfhtna48okLcBdDSWbECsr0q0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bXOf4ZT+; arc=none smtp.client-ip=209.85.221.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bXOf4ZT+" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-38dd011ff8bso3109713f8f.0; Tue, 11 Feb 2025 04:01:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739275301; x=1739880101; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ukI9L+W3BVJpqtTUxee+mj8XRSqHm8hW8ALqrNrwT90=; b=bXOf4ZT+yotJHyzi+8yNfLEcZAzHy3FaozWmsTRIXpSSv4SVbu2ZkaTkMFE1SLlAk+ 7k8U8c8ZHtVVi+XBKTmpy+386/WRjEN7UvTMfe+P2OnBG14G1SLFB4Fwn8UOinO2QUuU YUOxwqS7nJnFnvR7EqS5rn0bwmpNewOsHJ5gRhtxCtzOprDbmEUkeopcRFXxGM/e0uvE lXP/bpgRhcT49nKo9kxSWKXUpFMMxYMlad4rahCGLADrX21OA+Qykzg0E5m84uUmghaN y/7r6HLDk6Roy7c31U/q16NSftnhSZWq56WBNW8Nsqp1w2BF5NjQfIapZYY6orlwrJWI 8xzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739275301; x=1739880101; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ukI9L+W3BVJpqtTUxee+mj8XRSqHm8hW8ALqrNrwT90=; b=HBA0O3YfY5oYan5n+57oEA/6nmMSXZ3QNkSsTptVeqDvTVUzSNd8jMuaorwx51p2WG F9uKIrhyGSibyrHH2BgVIMpGG15W2Xi5kKYTssSKi95tMvjfUDixxBs8y2QKJSFN/4hG pZ9hPAjx/2suRUIinUzp6cK7TroBqEEg/YVGTKZKDXwZZvePwxLbuCi68kRD6+3plJir ILg+ROGPbMAFhGw2an20fiVPI+BgfwBA2HZag7ZhcD1VjrxA13uvNzfEoc2ZysF/D7Ok eCYBTLJju3Awe52ZUk2OGec0NNIkNKiUHKaa192aP/Gq3UlzVQnx0efOxilhTcHC+/d+ /+ZA== X-Forwarded-Encrypted: i=1; AJvYcCU6MN4ANbswJFY7hJrYZoIuEe8YbPsDxoalPEsiTjHXUBcL5lUNtsOkZePBJPv1QfAOyN/6cGPwqY55ZczgGA==@vger.kernel.org X-Gm-Message-State: AOJu0Yw9cmHSo2QH+GyKs8Vipz0yiOl+/KGu4/TsNldWm6SfLGyNdwBt DBWklzL4mihRScL9GQ9iXd089yFQ6wUgTmgoGcVFgRfuKZpJyGVHl8LRtg== X-Gm-Gg: ASbGncv3BXlbVrKegsVkCeeJDS2l6jmzxlt1AXwZpwJEP/A3qlavKB27jlBEi08FYyo PNpNysQZ5z+tHKvPNqbGyh20azX7WhGPIpkcmzvZrQ8uqTo2hSQZvMvkwPynux/HMf69Wdj9XY3 TUnzG17JBW7GyZ2fmlexzgGO8payOrTr8UWuvrqQxSSRlFe86gw5xOyW5B6jgOGltxl4eO98vkA 1+2uyBSdeKKDyVY9pJgnYCkYCAgVYBKou5fEoctYolK5kbQjAnl3TkVeEX81hC1B+3LORydha61 vXlFgw5/CjVKRDdLYUkh4ZujZQZJ8irAbw== X-Google-Smtp-Source: AGHT+IGat1/KySXHMoSlk+TobooD3C5IR62D68go2AuCGpWimmB0odeotXUOZUvr0qV4o1Y8gRgtyg== X-Received: by 2002:a05:6000:2c3:b0:38d:dbbc:3b07 with SMTP id ffacd0b85a97d-38ddbbc3d28mr8109398f8f.2.1739275300557; Tue, 11 Feb 2025 04:01:40 -0800 (PST) Received: from imac.lan ([2a02:8010:60a0:0:ac07:4372:f96c:546e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dc933ff9fsm12466658f8f.96.2025.02.11.04.01.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 04:01:39 -0800 (PST) From: Donald Hunter To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Johannes Berg , linux-wireless@vger.kernel.org Cc: donald.hunter@redhat.com, Donald Hunter Subject: [PATCH net-next v5 01/10] tools/net/ynl: remove extraneous plural from variable names Date: Tue, 11 Feb 2025 12:01:18 +0000 Message-ID: <20250211120127.84858-2-donald.hunter@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250211120127.84858-1-donald.hunter@gmail.com> References: <20250211120127.84858-1-donald.hunter@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 _decode_array_attr() uses variable subattrs in every branch when only one branch decodes more than a single attribute. Change the variable name to subattr in the branches that only decode a single attribute so that the intent is more obvious. Signed-off-by: Donald Hunter Acked-by: Jakub Kicinski --- tools/net/ynl/pyynl/lib/ynl.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/net/ynl/pyynl/lib/ynl.py b/tools/net/ynl/pyynl/lib/ynl.py index 08f8bf89cfc2..8b39d8b1eaa8 100644 --- a/tools/net/ynl/pyynl/lib/ynl.py +++ b/tools/net/ynl/pyynl/lib/ynl.py @@ -644,15 +644,15 @@ class YnlFamily(SpecFamily): subattrs = self._decode(NlAttrs(item.raw), attr_spec['nested-attributes']) decoded.append({ item.type: subattrs }) elif attr_spec["sub-type"] == 'binary': - subattrs = item.as_bin() + subattr = item.as_bin() if attr_spec.display_hint: - subattrs = self._formatted_string(subattrs, attr_spec.display_hint) - decoded.append(subattrs) + subattr = self._formatted_string(subattr, attr_spec.display_hint) + decoded.append(subattr) elif attr_spec["sub-type"] in NlAttr.type_formats: - subattrs = item.as_scalar(attr_spec['sub-type'], attr_spec.byte_order) + subattr = item.as_scalar(attr_spec['sub-type'], attr_spec.byte_order) if attr_spec.display_hint: - subattrs = self._formatted_string(subattrs, attr_spec.display_hint) - decoded.append(subattrs) + subattr = self._formatted_string(subattr, attr_spec.display_hint) + decoded.append(subattr) else: raise Exception(f'Unknown {attr_spec["sub-type"]} with name {attr_spec["name"]}') return decoded From patchwork Tue Feb 11 12:01:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Donald Hunter X-Patchwork-Id: 864405 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F3B61FDE3B; Tue, 11 Feb 2025 12:01:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739275308; cv=none; b=HnBGT+CRC6u3U4ieQC7rfIR5v64F3ROq5ogciyn4K9/bcnNoYNGB2Nf0hMluXpNDKLoHodo+ZNUZoxDR1SnrngmUHj7000DXHWU89XxUn1JQ02OARbJWBZyrprvT/ZniHRxdj3I08ngd+Q95jOXEiu/Slby209EhqA9exF2ba5A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739275308; c=relaxed/simple; bh=1sXRpKRdwQWU3PDhHFw9zXhzGGi7++rZDL+a2/5+euE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BW+pVcTUf+tILv3foN+gAkf9q9aufPG4oFVUMMcwBPGjnnUmYQhzchgnij9R8qGO7HhEOweCIdgg3ei7Z571NurekzLT8JylGoJCzpjQ+O5B20avj1F9gTC3T9hNCTPN94t82sTO/k2ANvHcR2UGMjM26gTUm7MQGl29zn97X8g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QuCy/ZIu; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QuCy/ZIu" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43932b9b09aso31877245e9.3; Tue, 11 Feb 2025 04:01:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739275303; x=1739880103; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xRuritwii5Exw4qc/zxuGeTLgpqDh2QQL5NTFCoOB4M=; b=QuCy/ZIuemjpuK0E2p25n+LD7ND0x7IUmMUNuGSZxbTAVvIKtAh8aY3LY1JDsYalcG za1T9yhygMpD/W21jDjhTyWCToJJNbiT+fsrKRAmkrsbApNE8Ly7A3/xKaxiB0hBXNiu AGHwaOpE2rJ0S4ZunUi3Wg9J/KvU1d5/aVXuvim650kj1IX4SBk9qwp3NxP6sWrORhOk L97/jtROi7bStn8/RANAygH9womlztxt0K26WmMZABDONCXY19jamw2PdmjueNff30am KWc3SdLJiOGgHvKnwXySQZKLJgQFssTQ28UgRjdbhqEMeaAyFkzSySgijxuHMo9BAdQe QkiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739275303; x=1739880103; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xRuritwii5Exw4qc/zxuGeTLgpqDh2QQL5NTFCoOB4M=; b=u+YFVZXbYHJqsxzm2I7R6UWA9K4opNrWPUqnprg3jHLDU25rQqBBR/mI6bIk8mC9Do o/KzudGoJPjEsY5x9xlgOBQQZWc9vkQpQaqJ45AL6a2N9zxgLAs8+Rv/wtV0Z+pF4jSp OZxNSEQrwL1W1APva6isCxEZIqzPiXwiR+Z5jvxAoueOGXm6WCC4VOes/XYpX9p6PRgg MdKurXoj7295pdzRbV0qOlNzoaXGFNtHaclLdrWpwJCp1iAdJgcV8m8Sw+lWZi19An7o wszWTuRb2bkiV63cVfaEEuhUnO3/iM/ByACaZ2IvEscg1ehEiFHJ7SVUdYpCqAf1N0ll KTCg== X-Forwarded-Encrypted: i=1; AJvYcCXAh73F39k+AhXDs2YI2XLr4Vm+Bj8wFqIx8Wkl6JBN9ufRG7EkKSS1xgk5vluhTmlb3zWLmq/N/i5GpbK86Q==@vger.kernel.org X-Gm-Message-State: AOJu0YwJgqr3J5h2OcSiuUwaWJI7HCfVSUFlz1+L87rvK2oN3hgxs3Db 2vm0llDb3GgmwtOZesc7CImGmTDYyUSMWgR83/kQ0DwMd2lb2lpuvzxkmw== X-Gm-Gg: ASbGncs8KrsPb4u++2pXNisEhC4dT0L9aUQZ03063pT+KiYb+QlfR0IhB9w1244RIDu DEbVj5io4yimnRDQ5xu4lsc72tGpPTefruS83J42AIYVHx4uBC7Y8wJ2NHliXzveCFhw6dXX7gH 8pJBEuYXQVWrCfeIIRymuNhE7nsweQU3SaG17ho+u3xuYlJLqKKez46bWep0JnoYPfz/aMMKaTP arKpn4vQQ+JmzIc99/OLw3iOUJO9lfPKbNruXYp1FzJQ9R0aXlVkGVA8ol8XOoqHOwvlqYSWtEo FharWy/lDu6iVUq9r2W8E8N+IxqxcPiymQ== X-Google-Smtp-Source: AGHT+IFH1+wcinOe+AK4yhfhykoikJm3E5IhoPWLH5ipxJg2h/X8+O8J3+RAvwpNj/qdYlBpqgS5Ng== X-Received: by 2002:a5d:47a9:0:b0:38d:d9e4:9ba0 with SMTP id ffacd0b85a97d-38dd9e49cccmr8900314f8f.25.1739275303239; Tue, 11 Feb 2025 04:01:43 -0800 (PST) Received: from imac.lan ([2a02:8010:60a0:0:ac07:4372:f96c:546e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dc933ff9fsm12466658f8f.96.2025.02.11.04.01.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 04:01:42 -0800 (PST) From: Donald Hunter To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Johannes Berg , linux-wireless@vger.kernel.org Cc: donald.hunter@redhat.com, Donald Hunter Subject: [PATCH net-next v5 03/10] tools/net/ynl: support rendering C array members to strings Date: Tue, 11 Feb 2025 12:01:20 +0000 Message-ID: <20250211120127.84858-4-donald.hunter@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250211120127.84858-1-donald.hunter@gmail.com> References: <20250211120127.84858-1-donald.hunter@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The nl80211 family encodes the list of supported ciphers as a C array of u32 values. Add support for translating arrays of scalars into strings for enum names and display hints. Signed-off-by: Donald Hunter Acked-by: Jakub Kicinski --- tools/net/ynl/pyynl/lib/ynl.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/net/ynl/pyynl/lib/ynl.py b/tools/net/ynl/pyynl/lib/ynl.py index b73e07f1f60c..62ce3340796f 100644 --- a/tools/net/ynl/pyynl/lib/ynl.py +++ b/tools/net/ynl/pyynl/lib/ynl.py @@ -627,6 +627,11 @@ class YnlFamily(SpecFamily): decoded = self._decode_struct(attr.raw, attr_spec.struct_name) elif attr_spec.sub_type: decoded = attr.as_c_array(attr_spec.sub_type) + if 'enum' in attr_spec: + decoded = [ self._decode_enum(x, attr_spec) for x in decoded ] + elif attr_spec.display_hint: + decoded = [ self._formatted_string(x, attr_spec.display_hint) + for x in decoded ] else: decoded = attr.as_bin() if attr_spec.display_hint: From patchwork Tue Feb 11 12:01:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Donald Hunter X-Patchwork-Id: 864404 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A6A01FAC3B; Tue, 11 Feb 2025 12:01:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739275309; cv=none; b=i7fVmCAm34685F/+IQ3nbjsYf2Idunn03DJytXjTKZZdHeKXIUAbz0SYxG+iUj5FO50eZaxX6ixr8NIsBIOMAE/1yexyoSwlK2yxNJ9kQi2CkIPxQSyEoFJoFfOgcGdbkJ5hjkdXNyb4yPkfJ7HmeWPCu3tWSYDSValAYhfA1Pg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739275309; c=relaxed/simple; bh=X9eINYij1abDhQD4o22GKAwE4z5ZgnCtWo5oJ7CpFNA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZLlH/vfdSy6+7fZyrfKEUnjj+maBebRVosZd3yMriStrCUxfCHd79LG5fDaZH8RTgJ3SxFKifFJkFYwVuq6cPk3JNAzbqcvKMqqtISslcSOVSZdZqQ4LZZNoXMm7TEJCVOnv/YEwQHYJX4g+bRUJX+7iJtovzHMe2g9G+azpIrU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BKOO4ioG; arc=none smtp.client-ip=209.85.128.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BKOO4ioG" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4394345e4d5so15431795e9.0; Tue, 11 Feb 2025 04:01:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739275305; x=1739880105; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vK4EKx0QpFzSPEovyIzsmnHNxkclruHqA9dDekWIaVg=; b=BKOO4ioGzyvt87z9XjhdPWF5DvJTmfWbvOO6BifuC/5494UJ7yyxwfD5+Reo2GGlNO VFD4DJcffw8KDh0/fFdTdR95FBvSbX4ebbkHUCbEaNWMKbhIe8QZTUaDHLDydaOrF9N1 8/as6rRzLo3GJAg4f5R+kf1jafQuaV6w8bPH7XNv/A+6qrA72cIh+sRHpBqDUZX4Pifu sGk4sYDfl09y3pithTnqZedY2aqvY+hk69ubclWDapqbHUKlr+2c57TfjsTntCCw1Llq vg2FZmqspqaE3WI5rvaoHLYtrd7GsAk6QAw2xxs/IfLMpy2/kCqjHyv3RGGGw4/QnJe1 3UbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739275305; x=1739880105; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vK4EKx0QpFzSPEovyIzsmnHNxkclruHqA9dDekWIaVg=; b=t5H3umaMVd75YdmPcX9h6G4jpVvfuaT+x0io5mWnhKcnZM/LfBefZSN8IIw9gqvIkV A6ldEADhNf0Sen+zr7lbKZ241CXk7UVr393guPXz5rGqLeNUlfWAlp/hYLjKdlAsQjsr VU3Dfd5njbu77FSKqBTooP+s1BNPc0+ZjTENTXgqPN44sAx9uBzHR3ouD0APEylVwHOc cK98T1KWU+Mynr6mPMh61B+NiIXybx0L6tHrvCYs1Xqz+G9Umio44VUc6mSeXrLcM/RU eyCUQEZjk6soKAroboJVvTwaWq38e7DfRn+IoYGrWzAJDXgjAlatWp3PF6MpdplR5zdO WHhA== X-Forwarded-Encrypted: i=1; AJvYcCV08+YG1z/pPwrcMPWtdmh0Ej95l9c/yGj7rSCM7JbqNdSPqcgB2/J4iHBE7jabXy0HZep7uW5e/fpVdHbPAw==@vger.kernel.org X-Gm-Message-State: AOJu0YwLkH3XGoV4Y8Y3lw3jLe8iZNz6W8quaCsFuD4gu8iNiyRfdXdg ves//O0zD+eSNO6ODIEIx4CUBs4RDcZaggMg6zXez5gXqo4SettF04adHw== X-Gm-Gg: ASbGncssPUcxVc/ixv23PiRdzDLNEH0TEh2PFI0RqsncTs5i+sEhaqEJr+KBLlo5Iiq WdgSWeDK/SvaRHjHIaCwJwGW3kVyVa9DfJv0QpkUcSx0/dXv0S0uonW6/2kKDer4YAC8milQubS mxW9TN5+OWSjJwYIgv91ymJey6m+hUtQcWTntj6VX/Gp7CBJu8a3UzhQV+JizULSu05k9eK13LR vymPUzXVSJo1bLIqeUiKEvuUN/ThjIwzQB2REMsVv5oH69JVMqhhJMCMPXEQnnvx0sVZHn8LMz4 26v+IXdGKmA+JHw7G5pa4s/DvXHzq00y3Q== X-Google-Smtp-Source: AGHT+IGs8lV7qlxTvOWv7qiI4peYrnEgyMDaAYVrmBbNIP1y2YGvlGBA1jLheec5QHZSHTjEvHCJ0w== X-Received: by 2002:a05:600c:450b:b0:439:4a9d:aecf with SMTP id 5b1f17b1804b1-4394a9db33bmr40246325e9.25.1739275305393; Tue, 11 Feb 2025 04:01:45 -0800 (PST) Received: from imac.lan ([2a02:8010:60a0:0:ac07:4372:f96c:546e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dc933ff9fsm12466658f8f.96.2025.02.11.04.01.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 04:01:44 -0800 (PST) From: Donald Hunter To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Johannes Berg , linux-wireless@vger.kernel.org Cc: donald.hunter@redhat.com, Donald Hunter Subject: [PATCH net-next v5 05/10] tools/net/ynl: add s8, s16 to valid scalars in ynl-gen-c Date: Tue, 11 Feb 2025 12:01:22 +0000 Message-ID: <20250211120127.84858-6-donald.hunter@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250211120127.84858-1-donald.hunter@gmail.com> References: <20250211120127.84858-1-donald.hunter@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add the missing s8 and s16 scalar types to the list of recognised scalars in ynl-gen-c. Signed-off-by: Donald Hunter Acked-by: Jakub Kicinski --- tools/net/ynl/pyynl/ynl_gen_c.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/net/ynl/pyynl/ynl_gen_c.py b/tools/net/ynl/pyynl/ynl_gen_c.py index b22082fd660e..d8fdee24ce25 100755 --- a/tools/net/ynl/pyynl/ynl_gen_c.py +++ b/tools/net/ynl/pyynl/ynl_gen_c.py @@ -1440,7 +1440,7 @@ class CodeWriter: self._ifdef_block = config_option -scalars = {'u8', 'u16', 'u32', 'u64', 's32', 's64', 'uint', 'sint'} +scalars = {'u8', 'u16', 'u32', 'u64', 's8', 's16', 's32', 's64', 'uint', 'sint'} direction_to_suffix = { 'reply': '_rsp', From patchwork Tue Feb 11 12:01:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Donald Hunter X-Patchwork-Id: 864403 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBFD31FA14B; Tue, 11 Feb 2025 12:01:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739275311; cv=none; b=hKANBTpGevZf0QwmvCsZJLw6DrarvQy/xlmvTdBERdTex9hWzPAV/r9QaKZpiSL/2Yhl0Zi8v9jTRdmDuRWWxG/Lsbhsh3196vbmZ2f8MdQit483N+oo5GaKGGn4aMKq7i+8bGIduIgWV4i8JipfqFPG2VCK2Ea5Mq/E9BsuwNU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739275311; c=relaxed/simple; bh=LQz/+A9c7Ho+lyWQrdtZ+ix0f8k72Xj8v4u62NQ7h/k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c7ukE97uykRCJSyxknYy/6PgkjOAdRye5tWegGXnosAFmkrakSjPIumK5uCLqtvDTJstoUniPu5QFYpgPDWq5OS18AWPGArrHYRAdqsnP8d6ngU/fKLaMqpQpONJ4rt7n0Ke8Py5PAOVzh15vYGLokZ7YLnYkVepgpKK+wxGiow= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IDJr9eAx; arc=none smtp.client-ip=209.85.221.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IDJr9eAx" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-38dcae0d6dcso2346047f8f.1; Tue, 11 Feb 2025 04:01:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739275308; x=1739880108; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tzpEi1hqY/grqIzyl8Qp9PHG4iGXdiSToBF1VycVE9Q=; b=IDJr9eAxlMo+HcSifUGM3IDmSemLkJ93jpCmVzlKbwO1YCywegR47hzKL4YLmZ+H04 vNJyWEAva7N6ZgZcNkPih7zCWuqnuOtD1xCB2LNb8O5lPeXfuCDf9uj+nn9cXxupCKfZ qXn5ZkvdzQJXW91iP3j9jvv+JsirEmp0jtZyrdrr5oGITq28YDmv8a7SQimr+44p+3Ij /vkmk9FivWcRlrBBJB1c8daNL9S9vgGwpTTNY21BcVF7nR9MWiWfG1bgNSeTUm1Tmo+O 3gDak/svwwWiqXRMeBaNVYS9S5IuhPQ9ZjTmxyry4DRfWhNk56J6MKejTLbbh8zUUYhN OfUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739275308; x=1739880108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tzpEi1hqY/grqIzyl8Qp9PHG4iGXdiSToBF1VycVE9Q=; b=DCa0ZlbwmEhHPtlHx1bwTq5y003xy46OXX3dCZ4I5TvTMTfpdDpp47+kf2hWN58D8Z 6KqgmFZBR5tQW/p3NhWRt2P44ivrE2F3847G1XKioMjbNjrjhjj8Fhj6xanUve7MC79I l0zeZG1O+XZaISxhbIbQf1dD7Qx0T3e9qczbIyW+0Vtn15Z6vRNPC+b1bMNWoNnah1t9 8i2QmM8MYX41I3EDDkWDzmjHlt0WJFikaoMR0JcR1MFKJSOdhLaBamsTA/7CNPz4Gv4L OoRASb89MLwtdrSqclbZg22FdYPhrWmx09gc8coK1HNXISA4l7exePPMssrLyJthv5GN WJMA== X-Forwarded-Encrypted: i=1; AJvYcCVdU3CNWIHw5ydirB3PmXN9uRl7ai6UsxobDSD4rg5V/LKy/j2TexT+1NE34QMw3FuLGQWBohaOruqnLQK3UQ==@vger.kernel.org X-Gm-Message-State: AOJu0YzZlbX1e45TIjuRJU2TFm8ifiiZxKZjSOdXyY0oxdsTknencRU6 2/BCTD+sxuHS3y5NMn3aXmY0cxWYrFHcO7nm6utO4mzO3B7PiqTbCFn0VQ== X-Gm-Gg: ASbGncv2KOABCtjHqOYZHNUWuMRoIW399pYbvbXSS1ZkVVU0V4BUZFJBWgtJr0dtolY EXRnTmheLbFoypiW0/Ikth+LUCWLMJYGpe3mN4hVosZ1aBz1RT9D7fDJ9Kwzb9Y1caFSsd4X2O1 erq69v/Ve8Rh/6ia3JIousffgHYIQUQufrWjrhBdx9SJC615ZiKS6uw2yf2aMzoXInBNOg/6pQ+ Ovi4yGxBgpSiZPn6Tb9QkRQrc4Nyxvt7tNfCuvcVsbFvBjGPRjC3OwPeqyKhsO/TMGyS2O3ouL0 X2FUlbq5HqVF4mOPi5YhZhafN0EwglrbEA== X-Google-Smtp-Source: AGHT+IFdbe/RWCZlGMsp83KMtKL6ldVm3MVZKs8DhYoQ6yB5uerkkz5DqDykDYCZSpmY+dbsiJYJnQ== X-Received: by 2002:a05:6000:1865:b0:38d:bf57:f371 with SMTP id ffacd0b85a97d-38dc9373270mr15098116f8f.48.1739275307683; Tue, 11 Feb 2025 04:01:47 -0800 (PST) Received: from imac.lan ([2a02:8010:60a0:0:ac07:4372:f96c:546e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dc933ff9fsm12466658f8f.96.2025.02.11.04.01.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 04:01:47 -0800 (PST) From: Donald Hunter To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Johannes Berg , linux-wireless@vger.kernel.org Cc: donald.hunter@redhat.com, Donald Hunter Subject: [PATCH net-next v5 07/10] tools/net/ynl: add indexed-array scalar support to ynl-gen-c Date: Tue, 11 Feb 2025 12:01:24 +0000 Message-ID: <20250211120127.84858-8-donald.hunter@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250211120127.84858-1-donald.hunter@gmail.com> References: <20250211120127.84858-1-donald.hunter@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Extend ynl-gen-c.py with support for indexed-array that has a scalar sub-type. Signed-off-by: Donald Hunter Acked-by: Jakub Kicinski --- tools/net/ynl/pyynl/ynl_gen_c.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/tools/net/ynl/pyynl/ynl_gen_c.py b/tools/net/ynl/pyynl/ynl_gen_c.py index 62a6d8c93765..a1427c537030 100755 --- a/tools/net/ynl/pyynl/ynl_gen_c.py +++ b/tools/net/ynl/pyynl/ynl_gen_c.py @@ -688,7 +688,10 @@ class TypeArrayNest(Type): raise Exception(f"Sub-type {self.attr['sub-type']} not supported yet") def _attr_typol(self): - return f'.type = YNL_PT_NEST, .nest = &{self.nested_render_name}_nest, ' + if self.attr['sub-type'] in scalars: + return f'.type = YNL_PT_U{c_upper(self.sub_type[1:])}, ' + else: + return f'.type = YNL_PT_NEST, .nest = &{self.nested_render_name}_nest, ' def _attr_get(self, ri, var): local_vars = ['const struct nlattr *attr2;'] @@ -890,7 +893,7 @@ class AttrSet(SpecAttrSet): elif elem['type'] == 'nest': t = TypeNest(self.family, self, elem, value) elif elem['type'] == 'indexed-array' and 'sub-type' in elem: - if elem["sub-type"] == 'nest': + if elem["sub-type"] in ['nest', 'u32']: t = TypeArrayNest(self.family, self, elem, value) else: raise Exception(f'new_attr: unsupported sub-type {elem["sub-type"]}') @@ -1674,6 +1677,9 @@ def _multi_parse(ri, struct, init_lines, local_vars): if aspec["sub-type"] == 'nest': local_vars.append(f'const struct nlattr *attr_{aspec.c_name};') array_nests.add(arg) + elif aspec['sub-type'] in scalars: + local_vars.append(f'const struct nlattr *attr_{aspec.c_name};') + array_nests.add(arg) else: raise Exception(f'Not supported sub-type {aspec["sub-type"]}') if 'multi-attr' in aspec: @@ -1729,11 +1735,17 @@ def _multi_parse(ri, struct, init_lines, local_vars): ri.cw.p(f"dst->{aspec.c_name} = calloc(n_{aspec.c_name}, sizeof(*dst->{aspec.c_name}));") ri.cw.p(f"dst->n_{aspec.c_name} = n_{aspec.c_name};") ri.cw.p('i = 0;') - ri.cw.p(f"parg.rsp_policy = &{aspec.nested_render_name}_nest;") + if 'nested-attributes' in aspec: + ri.cw.p(f"parg.rsp_policy = &{aspec.nested_render_name}_nest;") ri.cw.block_start(line=f"ynl_attr_for_each_nested(attr, attr_{aspec.c_name})") - ri.cw.p(f"parg.data = &dst->{aspec.c_name}[i];") - ri.cw.p(f"if ({aspec.nested_render_name}_parse(&parg, attr, ynl_attr_type(attr)))") - ri.cw.p('return YNL_PARSE_CB_ERROR;') + if 'nested-attributes' in aspec: + ri.cw.p(f"parg.data = &dst->{aspec.c_name}[i];") + ri.cw.p(f"if ({aspec.nested_render_name}_parse(&parg, attr, ynl_attr_type(attr)))") + ri.cw.p('return YNL_PARSE_CB_ERROR;') + elif aspec.sub_type in scalars: + ri.cw.p(f"dst->{aspec.c_name}[i] = ynl_attr_get_{aspec.sub_type}(attr);") + else: + raise Exception(f"Nest parsing type not supported in {aspec['name']}") ri.cw.p('i++;') ri.cw.block_end() ri.cw.block_end() From patchwork Tue Feb 11 12:01:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Donald Hunter X-Patchwork-Id: 864402 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C91521D5A7; Tue, 11 Feb 2025 12:01:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739275313; cv=none; b=dKlH3Gxi4BjTRi09bOAf7t4HQ+telfBFL7Ga3qs9BICmCUuJ2XZMzX9rtFkkHgY91Qtc3mkpnW1iEWd+bDVaEh0+Dca9DDCyiePd7Ab3IKwhsCe6DVB3dUI6BgMYnKfYwugfJFWIX1Ey8Nf3N/tBQNF03XR2uqN0iqCcoP+lGXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739275313; c=relaxed/simple; bh=hngH+nkRM+69V8gMEYAXSayqQbNSU/kvsOcQdYK01ko=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k/qKTTyImMiIYDX3Nxpzhe886Njn84BJGzTbSK27ouncREFibcQbS3Zx49C7HMI4PWeT3tq6MX4ks6RRSDUq5pmbTIAvRkXUcseAcsKErvSarUYRN73zMARsQxNC2DiT1dr4PZFQXNhGtRqn+dt63jXyMZp1IYSywQ6kNGCxer8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=B4zDk/jr; arc=none smtp.client-ip=209.85.221.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B4zDk/jr" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-38dc6d9b292so2292094f8f.2; Tue, 11 Feb 2025 04:01:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739275310; x=1739880110; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tpSnMf/WKCpk42PUpTTHzELsWuR5f0+/8dWnGZMy7ow=; b=B4zDk/jrwUlW8ZyUpy+1kY0qG2nTiZlexVTkXnAPfAriCgs3UQbWsbKPEAKa8kSnRP Bqb98YkVQbYtAD78aCK0w2VU701DvuXHHjM+uxkHgFq4REbJmqCy8o31+OgbQcKT1SZs bI7ItRTB1hgKuEnvUj7VIEpH0cxF8ycz1G+s0BX1lXxn13O+zl6Sf5zPg0/9kDIj30FP 0BdSrWkRMIUpa4OqdSdeQS9BBk4rGxTXKFkagxITzLxRhEQoA7baONebi7PCmQEgswii d6Iu7JVzrsUiOxnaMkjaLmMx/sOqarS/h4YbZ8NoEuJ01cFWMWDMyVc7bVzcWx1mXYzt 55bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739275310; x=1739880110; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tpSnMf/WKCpk42PUpTTHzELsWuR5f0+/8dWnGZMy7ow=; b=lPO2EQIUIkFS1spQEVQyk6m1GPCQLX2bhHqucIRDUCo2+aykmpar0Kir3zppNidvov 4OpZa2DkxSASSmCLAXB4ML89q6O7cxTXCVU+5UdSYjsLdlDWTfJYf+KuxtYwG1SjI5n6 gOo/kCr/nAEsPM8z4+Q0MfBL8C+ClCAFzYesQHvtjliiKKkRxZUbOqbWMSZWsxB3sRAC Z9i1H7biPUfGwTvqmHnag7M6hcx6bVCOCusPSjSVOtf6QpZnFo2NRnswOUz9HcSscYOW qAQZ1zeoaFYJH7f2eOuIQISwu1OZ17SgRiQXIue7DQYjtEOKpwNN4zN/AUeQI23J0he9 XRTA== X-Forwarded-Encrypted: i=1; AJvYcCUF+40h9iXw+qr6wYCPBnbZ/qlsInnDk6EOMGrR9SIzdNNPjI7B7VQwgJF+qfpPYwb9Py9d3CDmtXrEOitG+A==@vger.kernel.org X-Gm-Message-State: AOJu0Yxn/QYHDhIzRbvkFBOZJHZFe3te3AKLDpS1GHDqpJpt+xuwlC70 NDS1okXymqXEauPfkS7ID4O+2zAbN/4wg6wge8SxesitmN3FsjmAkubXuw== X-Gm-Gg: ASbGncvXO6w03S4kpJIK3yXMoUq4MmnDCfVMW+bN36aM0U17AQDC8gZdD+gOUHKeobs bEzbq2TtVUYcnn6cL1JB4mH84fhkmnyZWoLnMAUxBVLycBJb+U8xhKGe4NGY9qchjCUKHv/08Kv HSP3A9ZFl7Ntg1oAl+Xv7lB3PjC7hW3tNaBzkW7QkZb3g5LoFToOYb8G6/vQA77nHT5hkQufwRB WW0UZIZwFwk67V8SFiSa/qbA1Dwe0197tbpxzM7lzvLOzbjaRAFBCvzHVKFSRKEF1fkFCo/8chW DOpa2UgJAZOYsaijnL7VNXLP3+jFXvtA5A== X-Google-Smtp-Source: AGHT+IFl7qxo+QvC/sZKDIPHcPXMj4RoHPI+XMMI3LS7mw9RUxqCFTTOF3580dlJbdybp4/K9r4k2Q== X-Received: by 2002:a5d:59ae:0:b0:38d:d8e0:a9a1 with SMTP id ffacd0b85a97d-38de419486amr2914863f8f.29.1739275309962; Tue, 11 Feb 2025 04:01:49 -0800 (PST) Received: from imac.lan ([2a02:8010:60a0:0:ac07:4372:f96c:546e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dc933ff9fsm12466658f8f.96.2025.02.11.04.01.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 04:01:49 -0800 (PST) From: Donald Hunter To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Johannes Berg , linux-wireless@vger.kernel.org Cc: donald.hunter@redhat.com, Donald Hunter Subject: [PATCH net-next v5 09/10] netlink: specs: add s8, s16 to genetlink schemas Date: Tue, 11 Feb 2025 12:01:26 +0000 Message-ID: <20250211120127.84858-10-donald.hunter@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250211120127.84858-1-donald.hunter@gmail.com> References: <20250211120127.84858-1-donald.hunter@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add s8 and s16 types to the genetlink schemas to align scalar types across all schemas. Signed-off-by: Donald Hunter Reviewed-by: Jakub Kicinski --- Documentation/netlink/genetlink-c.yaml | 2 +- Documentation/netlink/genetlink-legacy.yaml | 2 +- Documentation/netlink/genetlink.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/netlink/genetlink-c.yaml b/Documentation/netlink/genetlink-c.yaml index 44f2226160ca..96fa1f1522ed 100644 --- a/Documentation/netlink/genetlink-c.yaml +++ b/Documentation/netlink/genetlink-c.yaml @@ -161,7 +161,7 @@ properties: type: string type: &attr-type enum: [ unused, pad, flag, binary, - uint, sint, u8, u16, u32, u64, s32, s64, + uint, sint, u8, u16, u32, u64, s8, s16, s32, s64, string, nest, indexed-array, nest-type-value ] doc: description: Documentation of the attribute. diff --git a/Documentation/netlink/genetlink-legacy.yaml b/Documentation/netlink/genetlink-legacy.yaml index c02ed8089746..a8c5b521937d 100644 --- a/Documentation/netlink/genetlink-legacy.yaml +++ b/Documentation/netlink/genetlink-legacy.yaml @@ -207,7 +207,7 @@ properties: type: &attr-type description: The netlink attribute type enum: [ unused, pad, flag, binary, bitfield32, - uint, sint, u8, u16, u32, u64, s32, s64, + uint, sint, u8, u16, u32, u64, s8, s16, s32, s64, string, nest, indexed-array, nest-type-value ] doc: description: Documentation of the attribute. diff --git a/Documentation/netlink/genetlink.yaml b/Documentation/netlink/genetlink.yaml index e43e50dba2e4..40efbbad76ab 100644 --- a/Documentation/netlink/genetlink.yaml +++ b/Documentation/netlink/genetlink.yaml @@ -124,7 +124,7 @@ properties: type: string type: &attr-type enum: [ unused, pad, flag, binary, - uint, sint, u8, u16, u32, u64, s32, s64, + uint, sint, u8, u16, u32, u64, s8, s16, s32, s64, string, nest, indexed-array, nest-type-value ] doc: description: Documentation of the attribute.