From nobody Tue Dec 16 18:25:47 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 4dW52z4dmRz6KwwK for ; Tue, 16 Dec 2025 18:25:47 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dW52z1VNKz3YsT for ; Tue, 16 Dec 2025 18:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765909547; 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=wu440wBqUQIT9yLxvQT/VJp57JG3/sNs+LM1MZjBgxU=; b=H33YHoDBt7YPgsg7vUf9YJF6gur1jWmXVujHoEPQ/QwisJlxKjmhDdArHWxyi7w+3c++r1 JFUERkhxaYzWSuFBjgPEDfUooDJkA3sY57JrEgrKppsYpjdKLOH7A2Rm/BEWfRgFBqwq98 8HsSrO3VTUd38W26coJ6wBt3Q9gftJVWtDUCJROSfo2+/ndLjZhyybLufgDT1KAicraKPS 1G1Ki2bTZgaYO6BIJofCo0+fqNU/COKKFaWwuznjhIjEZo1BereTPVc5aYq0aD+/wP7Nf6 dO+9cL4LWUURAMebfla2GNN7oD/Lta0vrYZqcLIVznGozCc3ZN4TFADtpPP7mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765909547; 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=wu440wBqUQIT9yLxvQT/VJp57JG3/sNs+LM1MZjBgxU=; b=t1l864HlLkGogc/3XsKED8a0pUFZ9GUIAtiJqsgqaoXlbBx2oVW4pBPoYCAGgb87JIYc+k Xlazd1EesjNu+HJWBxWddE/iogjUDWv4I072YNrYpwsXsgFKXLkhzA7MTgTxfQPa2BIy3z /4w8owbjJjgq37T/Ue8SJNbvXK8IY4iH0B4922u7dqwF7tveA2fb2PQDaR/SMm61BCn8PS eSIfVQ0yoYaldSkGpWEVz9PlH0IcNp4a0ConAzq618cjmje+lEVtbzy0Y898sRTZmfWMfk Kw5DEenAFMLmtO7RO06ptkpm0/EQBihCM4+JdDJKoET9/p60oWow+PquIU3PpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765909547; a=rsa-sha256; cv=none; b=xefjZUmob9vjky/mJVMg1k+s7fqn70kJKaZtE4OcWm4XeZZk3RZI8D8hvP6d/7I5M4v2Jb ac7bvHFyPh5eNGYJnKTKDzvjwjD23/QTGiV7NfVGxbMlelsGo2/3AQalH9oi16uMTQFazh dsFEy8GtL1N3m8c2N6FfswCNdRbhWKqxyQkjo6ItUqZpYD5Vmfl73j3/X4R5KcSN2OYsPI nWn9+yIfLHY3BwkETB0SgbxX6pybCnj7P3DtL4VCC+qY9yu686otJkLCRBGkYC7kFbbW42 jav2CH++mJDgNNj9EUudoNnpGh5galeZ3J5CATv7ay2H7A72h1zYeod4HVO8sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dW52z13qDz30N for ; Tue, 16 Dec 2025 18:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23f0f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Dec 2025 18:25:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 8b780f75f7ef - main - libpcap: disable more code related to USB pseudo-interfaces 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b780f75f7ef9ef56935800220e65c47171b74c4 Auto-Submitted: auto-generated Date: Tue, 16 Dec 2025 18:25:47 +0000 Message-Id: <6941a42b.23f0f.21510f8f@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8b780f75f7ef9ef56935800220e65c47171b74c4 commit 8b780f75f7ef9ef56935800220e65c47171b74c4 Author: Gleb Smirnoff AuthorDate: 2025-12-16 18:25:12 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-16 18:25:12 +0000 libpcap: disable more code related to USB pseudo-interfaces Fixes: 6e297e1cdff3568da19760e7e7c615ee4e8383ef --- contrib/libpcap/pcap-bpf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/libpcap/pcap-bpf.c b/contrib/libpcap/pcap-bpf.c index aff33c218c0d..83a363eee0bd 100644 --- a/contrib/libpcap/pcap-bpf.c +++ b/contrib/libpcap/pcap-bpf.c @@ -43,7 +43,7 @@ #endif #include -#if defined(__FreeBSD__) && defined(SIOCIFCREATE2) +#if defined(__FreeBSD__) && __FreeBSD_version < 1600006 /* * Add support for capturing on FreeBSD usbusN interfaces. */ @@ -1721,7 +1721,7 @@ pcap_cleanup_bpf(pcap_t *p) } #endif /* HAVE_BSD_IEEE80211 */ -#if defined(__FreeBSD__) && defined(SIOCIFCREATE2) +#if defined(__FreeBSD__) && __FreeBSD_version < 1600006 /* * Attempt to destroy the usbusN interface that we created. */ @@ -1738,7 +1738,7 @@ pcap_cleanup_bpf(pcap_t *p) } } } -#endif /* defined(__FreeBSD__) && defined(SIOCIFCREATE2) */ +#endif /* defined(__FreeBSD__) && __FreeBSD_version < 1600006 */ /* * Take this pcap out of the list of pcaps for which we * have to take the interface out of some mode.