From nobody Wed Apr 05 22:23:38 2023 X-Original-To: dev-commits-src-branches@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 4PsK0V2Q6lz44Fyb; Wed, 5 Apr 2023 22:23:38 +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 4PsK0V1zn8z3w0Y; Wed, 5 Apr 2023 22:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680733418; 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=YwBz9mVfuJX22+3EelqSxMGg71YYFxiBJEn0jEgnjC4=; b=ulbIBHH3qa4oDS9FryKyLVaqigmmdbe7DC1nt+/+bd8aD5/c58EWX4izWSk/ca1ZpyPv6O HaUazqXpWbc/nJGosiZNdmxC3WQkJpmbz0QvW7VoYCvZVYqTeArWaoCz9+6RoYA7GvVrVi wxWuK8vEBcvOK4PxibK31CxeYxUe4BxPnNjM5pxJTU0gacMLzbqqNLNipwwdsrIOslGkkn tsqLVaeot7vBZIMiGJLXvYOv4dJggYh8HpAOgf4sx6kELFQIcaabZ067du5ZVjp6XHMpA+ 0d8wGybLQNKQTXsUqYzzLuRjlpOqOQO9i9qdR4/v/lhd887TxFvMgGR0PnLD+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680733418; 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=YwBz9mVfuJX22+3EelqSxMGg71YYFxiBJEn0jEgnjC4=; b=MKXydCMBdqtlVsGefrPcuMNn/Xl1zvfhnkaTq/3kQunJvkijZwG6sTVk5p3SdqEX0nR0tM g7Y4KDytAkDrByEdT9ExzZ8Y8IWjifiDfU8FD646AUay1F5aUpnE/ymlmnlJPxPDxsM5Xm OFh3uPSeWHEjLanJ9Lcq1OnWeaoVtSUtgX4QuC1k2bAjJRTRSI2OWKL0OwSBWa/fPTuMOG Nk3NIHFrhmLl9FG233rIABSVDGspoUOKH8bj3T1oU8wgKewGXD+15S1FKxwNLQf1TJrkkP PULnbOkNOEB3OeqU9GPS/zOFLadCGbKbzZMeJMEJheftYBQOIfvcZAET+rc+sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680733418; a=rsa-sha256; cv=none; b=EyZml6TUeiPLhQdzwnlPlj4pZ44K+LYnzDKik3BW+IFdAO2pWBDsXyr3XvZ0uymBbxxr+K Tofj5wy6WUD2oUja4cyc6NXiNDsbyurxmUHP4IeYs+TFZ8GyhFnDi2dvB/GcwG+Zfuymkn sYogWExhVsAOTG/KKb8W3zot6bCSlopuskw6rEwvC6Fx7rtFK9PONgWVsGdGZD+OQXVFy0 2LOQcT+J7CZpOrJGfrRNKS8n5vvvJuvofIb1bHwkG0zPLIazUBf05886bFjM5/7jsVkBuA JEjo9yfk/muURK8Qgl0ItvkWOgnEVSgDkHbISzozyGz3YdgnPNKmeSATScPgow== 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 4PsK0V12wdzgMy; Wed, 5 Apr 2023 22:23:38 +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 335MNcoR074042; Wed, 5 Apr 2023 22:23:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335MNc4d074041; Wed, 5 Apr 2023 22:23:38 GMT (envelope-from git) Date: Wed, 5 Apr 2023 22:23:38 GMT Message-Id: <202304052223.335MNc4d074041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vincenzo Maffione Subject: git: d94a88d249b0 - stable/13 - netmap: fix build issue in unit test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d94a88d249b05436c2ab8601557ac24580fdaca2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=d94a88d249b05436c2ab8601557ac24580fdaca2 commit d94a88d249b05436c2ab8601557ac24580fdaca2 Author: Vincenzo Maffione AuthorDate: 2023-04-05 22:19:13 +0000 Commit: Vincenzo Maffione CommitDate: 2023-04-05 22:19:13 +0000 netmap: fix build issue in unit test This is a direct commit to fix a build issue introduced by b74063f03a834e9f22fb46f8e989a9df19823ff0 (cherry-picked MFC). The build failure is caused by the use of a netmap option that is available in CURRENT but not in stable/13. Fix it by using an option code that is available also in stable/13. The option value is not relevant for the test. --- tests/sys/netmap/ctrl-api-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/netmap/ctrl-api-test.c b/tests/sys/netmap/ctrl-api-test.c index 67c7bfbf5315..bf85fbb76a2b 100644 --- a/tests/sys/netmap/ctrl-api-test.c +++ b/tests/sys/netmap/ctrl-api-test.c @@ -1004,7 +1004,7 @@ infinite_options2(struct TestContext *ctx) printf("Testing infinite list of options on %s (valid options)\n", ctx->ifname_ext); memset(&opt, 0, sizeof(opt)); - opt.nro_reqtype = NETMAP_REQ_OPT_OFFSETS; + opt.nro_reqtype = NETMAP_REQ_OPT_CSB; push_option(&opt, ctx); opt.nro_next = (uintptr_t)&opt; if (port_register_hwall(ctx) >= 0)