From nobody Tue Oct 29 05:03:27 2024 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 4Xcynq6vNjz5Zklv; Tue, 29 Oct 2024 05:03:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xcynq6FR4z4S2W; Tue, 29 Oct 2024 05:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730178207; 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=Q0oZ41lZDhAQ2sjltOEEAD1DeGdZcKPbAh6ELEcfdL8=; b=QoKlzo9Y5rKbE2XO0ZHLvEcRel+ObQ1TxeHSQt4wWBBmWhQ19C5tRa9TwFn592x6Uu67dy v2rgFZ0uQ0MCFLZ93drk6QdOUhwMyo9eoMz56ctgHCdVj24BcnoqwUbo+BXMEqkhSlLYtd 6Z+LWzSMxxIFEfdsvexNhxnFm/KulHoD9mGpauap+keBt5PXf+8mJ/qH/7kv3kdLR2AuGB zaU5yrLSbbcnatvXzRHL7KKcUDwwb9AtVInEqYtQTSPfnVHBI51znb0DHbKJ0BVgrwOS64 N3tnPBkLXJ/TT6/Vl0bcqThH/r437yhnftmttDnkKJKMGC0YpJVtEbuR2NhPow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730178207; 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=Q0oZ41lZDhAQ2sjltOEEAD1DeGdZcKPbAh6ELEcfdL8=; b=BM0RK/o6LEGX6XU7KfhsSK2PMztUPJS0YipNHviIOlCp/eV5uvMiVnCHx3Q6Z19dFJ+POJ kfEYnLE7LGAyq2kaIOhUGZ2po4O65Yo6PDo1bS84fb18mOMxJH9jc2nawKQb/pDodNIGHx SHGCQDCCrxdLNqnOs4VrOFclqMsccsRza/AwJbYRZ4XC2cn/RbZkKi3M07LisZdElCwz0m NqCtXVj7l96lXM6POWnx0vw8MGM7SN7GD5d+4LJCMGYEfpMC0GHgLJNEKoy5emcq9jJUTK gV5KRQSWF8dUtfyPKd5whplnVfp9S8uqAdw4Zts2PPwEBZADLr5UDXLe8BCNcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730178207; a=rsa-sha256; cv=none; b=SZC4orCZUYcrclcMllYkdjAw6KMsxnWl8GebmWBGJoITrmUUg1WwkDVcDdqSpkAw1/3VbV pXPdKaw0lhy/4SjoJCWg3RH478LzH/73/AlMruoyRqNTe6jwB9uUvisQ1hPpdsGWfszU3q Z1MdvPBfLq7wS/DM67d/C+b0IW7QhOjWEgrRWRG0Nj4v0sjVrywveAIHIqbnFQ0Gv47LIA WKEZjNhi3g89Ri1jJxnJkPlcDrJwePfXhfyjRQSNbkfTnve68B7nLibuBxQRqyel1wI28k 9AsycXCVAklPeVeGz/rXwusrhYiQ+yL7SERWrsrzvKch+mUGY5CDa1aK77atLQ== 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 4Xcynq5qV3z18Gc; Tue, 29 Oct 2024 05:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49T53RCA090585; Tue, 29 Oct 2024 05:03:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49T53RfK090582; Tue, 29 Oct 2024 05:03:27 GMT (envelope-from git) Date: Tue, 29 Oct 2024 05:03:27 GMT Message-Id: <202410290503.49T53RfK090582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 3aedf015d1a3 - stable/14 - if_ixv: fix build without NETMAP 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3aedf015d1a304184b48c3fce016dd9083dba790 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=3aedf015d1a304184b48c3fce016dd9083dba790 commit 3aedf015d1a304184b48c3fce016dd9083dba790 Author: Konstantin Belousov AuthorDate: 2024-10-26 23:37:09 +0000 Commit: Kevin Bowling CommitDate: 2024-10-29 05:03:00 +0000 if_ixv: fix build without NETMAP Sponsored by: The FreeBSD Foundation (cherry picked from commit b0993e3bcaec60701f3ae56df255433eb4bcd091) --- sys/dev/ixgbe/if_ixv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c index d5fe1a5c6b30..467a56e7269f 100644 --- a/sys/dev/ixgbe/if_ixv.c +++ b/sys/dev/ixgbe/if_ixv.c @@ -1373,7 +1373,9 @@ ixv_initialize_receive_units(if_ctx_t ctx) struct ixgbe_softc *sc = iflib_get_softc(ctx); if_softc_ctx_t scctx; struct ixgbe_hw *hw = &sc->hw; +#ifdef DEV_NETMAP if_t ifp = iflib_get_ifp(ctx); +#endif struct ix_rx_queue *que = sc->rx_queues; u32 bufsz, psrtype;