From nobody Mon Jan 23 22:11:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P14820L2zz2t0Ky; Mon, 23 Jan 2023 22:11:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P14816K6xz3KPn; Mon, 23 Jan 2023 22:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nvouR1rMX+LunuGkq3soXMVuFr48SD79ljyO1qToevw=; b=cV675g27WzXBTEr5VCXqnxwjvT6lg1iDCEkS70RkWZxbbIxL1iNnxCdWAQitj18Ik5Rxi/ hSuou89DZZwZ6On2dMFTHhsM7cKHetuRlFYWuBg9qQUHmIekjGjaK5DA6X6+8YqdfA/mjh 7mSWlwqeF/GN4AA9PYjkNlY5IkrrCZRsL9VuOgDGymAIK/7qdvmaciXaztueCxcqNrckMa nyzfDpWx1HKDbdzYDRqDp65kaVYk09wlxAx/t/Eff2ANoqI8DVCwusHtZceGlp470+ZJQI 1EEEhF0IvwmQKtrSVpcGYLHyGtwXZII78uimEJIVyNIJT1tBuJO4xGZzCXtZHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nvouR1rMX+LunuGkq3soXMVuFr48SD79ljyO1qToevw=; b=u5/ntuVb/hutO8uImixeK9LinlqWpLN6dwTpYJsJY7J9lAgIVkkMzZFPGm+6LYrPypbDiJ YThsKlyMdPXf86BFCkTpL75Xav1gQ6dTKB/6oROw5aCkL9gukaAUYC4pmnFmx5nnWS/GCa FIFry2A5Wh0o8YC3LdpjwzFER/ixxQl+/uEgIDz3BRTvG28Nm7ybpBeRFWWpS6PK3ALyEC /EoDWWPpHsGEc8vZ2GXDcrroCJLeXOoG2ay0qAOve+hdlYoIm38EO3y+8R8EZxpar/lCYy Bu6k2Y8b9bqRXwBORWtPj6WPBFOH5YY93Ax7dFvE/HZIAIXzqTRasuhL4dmHbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674511905; a=rsa-sha256; cv=none; b=l81Ry3/8d1qpU1UcxNFyCF9XgFRE8ppIeKP7bnaKmRbD9Kq3QLVAc+blZHqiOrocppjwL9 qk/Dxiu0nXVnT+vBaGGILvFlKPAP900bPESbx/amkajTthf0tg+l/nIi17hUAwy33Vh5Ck VpYhoo4hrSERSRVGJGVCmcUvPRCKhlQED4ULNscoIFRGIJ6KrDK/LFDyRk8+ldUAt0EoLZ bdp6ld1Xm1XmH0DhPlS3Zbqy44JPJ//74nToQhRcn3PzQx3a4P8RTeyN655SyF+uu1PrTM 5IAx2qaQSPGrmPAc8SQYDDH/toCH6/URoWa9gY2Lf3uXIFyDHtv244OcGQs6Hg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P14815KYmzlBm; Mon, 23 Jan 2023 22:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30NMBjDK012505; Mon, 23 Jan 2023 22:11:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NMBjpn012504; Mon, 23 Jan 2023 22:11:45 GMT (envelope-from git) Date: Mon, 23 Jan 2023 22:11:45 GMT Message-Id: <202301232211.30NMBjpn012504@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 265a6220a3e3 - stable/13 - netlink: fix build without INVARIANTS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 265a6220a3e359c52d0429c04707b3eb225436f4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=265a6220a3e359c52d0429c04707b3eb225436f4 commit 265a6220a3e359c52d0429c04707b3eb225436f4 Author: Alexander V. Chernikov AuthorDate: 2022-10-01 21:20:50 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-23 22:04:02 +0000 netlink: fix build without INVARIANTS Reported by: cy (cherry picked from commit 03994c24da957ffd6556096cdd6f6522eb968ba8) --- sys/netlink/netlink_message_parser.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netlink/netlink_message_parser.h b/sys/netlink/netlink_message_parser.h index 2f802b0961ad..b23b223ef80e 100644 --- a/sys/netlink/netlink_message_parser.h +++ b/sys/netlink/netlink_message_parser.h @@ -249,6 +249,7 @@ nl_parse_nested(struct nlattr *nla, const struct nlhdr_parser *parser, static inline void nl_verify_parsers(const struct nlhdr_parser **parser, int count) { +#ifdef INVARIANTS for (int i = 0; i < count; i++) { const struct nlhdr_parser *p = parser[i]; int attr_type = 0; @@ -257,6 +258,7 @@ nl_verify_parsers(const struct nlhdr_parser **parser, int count) attr_type = p->np[j].type; } } +#endif } void nl_verify_parsers(const struct nlhdr_parser **parser, int count); #define NL_VERIFY_PARSERS(_p) nl_verify_parsers((_p), NL_ARRAY_LEN(_p))