From nobody Wed Apr 1 00:33:28 2026 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 4flmDt1cQ5z6YNSr for ; Wed, 01 Apr 2026 00:33:34 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4flmDt0T1Bz3wGm for ; Wed, 01 Apr 2026 00:33:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775003614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fg0KEG6IDDI3RsR5MgmalauLKj3MbLulmEC5vC7W5tM=; b=M+ijnHZbq/d77aJFCJFzeoM9BaPcGCXT6/m+PGv2QRbIc2RkFfHHBWKKl1ogoSR/3K2izT QxMkF0MikqU4kAgIzBQXUOK6uGncttwhdl0Z3EPXYuU6C2Z01cNj0s3mjnmiFRANhVcCa/ DK6qSWwU0WU86UiWdbNGPGgRl7j41i1VPs9rXY6Zz+Aaz6m8T4/dYIYjRSehCgeFQ1LlF8 WRklJSR0SavHBNuncoxq9VJbeIU+fwCmSj2q2l1dpqPoX7grcoDzyaYcWGoET3LPLRaFVA ymkiLfTWHsFrr5Ww5/QQQwj66Ii3bPa7oHf6yhsEWpmvxz4FUWt2S7lp7h5f4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775003614; a=rsa-sha256; cv=none; b=lXs0ZJn5Ndlg27UkI31BDxAsO5/V2NkYBAGJZnlHa7q3o9iDyDV5DCbiuLcBmRRMRY1iIA w+G4QtpxmuKGk8H3Ta6CY+2lJEjLLPCozPNpU1vDhg9pqplHkATi6XCpvRsWAPPHAxkT3/ vrxsNbtT/rSifPkPc8qvz0ZkBOquSAJoHE7g5E1mn6VYONstcnNFUPlnZcS1iu2ddgvvG+ S4rJ1b+4z7LOsShrS44AXs2TbdBtVAAtu4+Olmv1SCu5pvTq/sp4O3NGJYa7RqcMUyA5kG LCAJqa2ZaIvPRLyB3stcFxXk+sAr0wx/gNEe4viu3B0GnyAuNCyWHqGGe2OEpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775003614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fg0KEG6IDDI3RsR5MgmalauLKj3MbLulmEC5vC7W5tM=; b=uhHs7aGwQP/Eo320jWOe02FyqUPChrKy2zvxE0S/2oj4P0+6oTRQCQ+e7ctsEwRIh0EF4C D8CR9OaW28gqK9XaqauXEtVXuXPbSnNLWg8DYq/+tbZhJqNtqAUSIYlNdRE8XCXlvVOWoN B3ucY1nOgM2n5HB69TtmmQOTEeD0HnSMMntf5GcfbPO/f6riZwHHLTQp4uSVif8JEwyBjT T+qC1xOJsC6da4mI+YMO94CG+ahfXo98JYbfcJapHB7JE/zZw9tEjs+m3uECl761AxBqx7 m4QeMQTXzCfrmHksU6JicumMBt64OJoh/9gv1BfFi0norZx+KND69AL0jTwPPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flmDs73rgzsjk for ; Wed, 01 Apr 2026 00:33:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21c8f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 01 Apr 2026 00:33:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Enji Cooper From: Mark Johnston Subject: git: b20f0e608df2 - stable/15 - divert: unbreak the LINT-NOIP build 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b20f0e608df2cbb50f382b6d347a71904cb1faeb Auto-Submitted: auto-generated Date: Wed, 01 Apr 2026 00:33:28 +0000 Message-Id: <69cc67d8.21c8f.5954bc8@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b20f0e608df2cbb50f382b6d347a71904cb1faeb commit b20f0e608df2cbb50f382b6d347a71904cb1faeb Author: Enji Cooper AuthorDate: 2026-02-26 23:06:36 +0000 Commit: Mark Johnston CommitDate: 2026-04-01 00:27:24 +0000 divert: unbreak the LINT-NOIP build Only expose `dcb` when either `INET` or `INET6` is defined. Reported by: clang (`-Wunused`) MFC after: 1 week Fixes 5547a7bb39 ("divert: Use a better source identifier...") Differential Revision: https://reviews.freebsd.org/D55548 (cherry picked from commit bd758ebac3272f720c051570e043e4bc653dcd48) --- sys/netinet/ip_divert.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 75371c7dacb3..046df7f99ed8 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -503,10 +503,11 @@ static int div_output_inbound(int family, struct socket *so, struct mbuf *m, struct sockaddr_in *sin) { - struct divcb *dcb; +#if defined(INET) || defined(INET6) + struct divcb *dcb = so->so_pcb; +#endif struct ifaddr *ifa; - dcb = so->so_pcb; if (m->m_pkthdr.rcvif == NULL) { /* * No luck with the name, check by IP address.