Date: Tue, 16 Dec 2025 18:25:47 +0000 From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 8b780f75f7ef - main - libpcap: disable more code related to USB pseudo-interfaces Message-ID: <6941a42b.23f0f.21510f8f@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8b780f75f7ef9ef56935800220e65c47171b74c4 commit 8b780f75f7ef9ef56935800220e65c47171b74c4 Author: Gleb Smirnoff <glebius@FreeBSD.org> AuthorDate: 2025-12-16 18:25:12 +0000 Commit: Gleb Smirnoff <glebius@FreeBSD.org> 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 <sys/utsname.h> -#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.help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6941a42b.23f0f.21510f8f>