From nobody Fri Aug 15 17:06:11 2025 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 4c3T5w2DwNz642gG; Fri, 15 Aug 2025 17:06:12 +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 4c3T5w0pCfz4KVb; Fri, 15 Aug 2025 17:06:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755277572; 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=xjXxmO4gHQC3kKOj89hVwdxbJpG6+9qT+KvbyBZ0TwE=; b=UWZbNPQEcFLpdXtNG5c0ohVJl9nTRymY8cw5MNKOyNgUAPW0cCFSchNLAJAsiSFbCdN0jk mVfKyDruS1z1zgxoe/z6XU1IrNWVHEWeBAZuzBAfFv3ZgeT4MOfuHYb4PjdKAy06x2Q3xC QVJMhz4fOvRKe+f7m1A7xZCbRwyaXtn++L98juIPudrAOKBpdVmSAq7egLjBkaAbyP5g27 mGpztqCw/1+mw2xLUiRdkCzaqhPsdpDbP9KKVYS4zNu2aYeGgYAESppxvBfjia94rjD4Td 8qftx9i4mpItDTP4ebb9Qrw4rkFViePOAYbv1yNVRV+HK6LISC4Da5mDo1dD5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755277572; 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=xjXxmO4gHQC3kKOj89hVwdxbJpG6+9qT+KvbyBZ0TwE=; b=WfOWfEVdYxd1crSUlLeJ1s3TlC5tjp5CDFM+U6rt12Z7sE9Qd5e46y/D9Z5cmOBP1TFDs+ rCUruxofKoEDrc5xFvs1LKvf9FlvtASIC90BNoDsowSnAK9kFFsd8YNLPOlYL02dUeRQuQ GvptTni03HhHZVZtWHjaOOIUjmfhUtohUPxLXEIHdv/+rQ0vNliTtfPkrUusgjb723ONqt P3Ea6c/yK0VGnk0LqUGSFNTSy6v3aOVvU1R5Clf4aFMfBd5teB1+mau6O5PGKaQfdQ0gK9 TxkoQ5i8nq73pF+DT8CFj+5YoO/ktyB/tBaDLxMWNyZAse/utNUGYGKtPRWRKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755277572; a=rsa-sha256; cv=none; b=YrULMT0y4hT6StuORpfWnCNcz/D1U+0J4KLxC+NYnXpaUo/K9ygLRyW9KAw6ducQLpV9J/ lKMqxo35el6s8QwcmoIf8HNs0yJMcjzUnQnx6t5E6PDNYt1mG2sT1lBfYatvoGtLFzLt7N LsxCRQ/94DrPSXdTdl7aDQS3sYLja+qQnLKslKM/JkWvkUggz+Uv70MrAyxm4jhgWrI2Lz fqCJ0IXOQd/CTD+81TJEkwLMqE9bBdKYIdmrEr2kRdgYZoTO3OYnAj4kZ/fYZzYtBcls+d HO9PwXKyfSnKNowg2XQMMjVhi/5giGaT1cYAgVvQ3GIuPsJgkHzAZtN/ZzCLSQ== 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 4c3T5w06vBznV3; Fri, 15 Aug 2025 17:06:12 +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 57FH6BuQ097292; Fri, 15 Aug 2025 17:06:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57FH6Bme097289; Fri, 15 Aug 2025 17:06:11 GMT (envelope-from git) Date: Fri, 15 Aug 2025 17:06:11 GMT Message-Id: <202508151706.57FH6Bme097289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a95b1744f610 - main - iflib: Only define lro_enabled if either INET or INET6 is defined 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a95b1744f6108236977294318ae265642e4dcdae Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a95b1744f6108236977294318ae265642e4dcdae commit a95b1744f6108236977294318ae265642e4dcdae Author: John Baldwin AuthorDate: 2025-08-15 16:59:18 +0000 Commit: John Baldwin CommitDate: 2025-08-15 17:06:03 +0000 iflib: Only define lro_enabled if either INET or INET6 is defined Fixes: e69573bc2bee ("iflib: simplify lro & use tcp_lro_queue_mbuf()") --- sys/net/iflib.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 6638c90882aa..2b43f6f19051 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -2910,7 +2910,9 @@ iflib_rxeof(iflib_rxq_t rxq, qidx_t budget) struct if_rxd_info ri; int err, budget_left, rx_bytes, rx_pkts; iflib_fl_t fl; +#if defined(INET6) || defined(INET) int lro_enabled; +#endif uint8_t retval = 0; /* @@ -2936,7 +2938,9 @@ iflib_rxeof(iflib_rxq_t rxq, qidx_t budget) return (retval); } +#if defined(INET6) || defined(INET) lro_enabled = (if_getcapenable(ifp) & IFCAP_LRO); +#endif /* pfil needs the vnet to be set */ CURVNET_SET_QUIET(if_getvnet(ifp));