From nobody Wed Sep 3 18:05:40 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 4cH9Wm6fcTz66qqG; Wed, 03 Sep 2025 18:05:40 +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 4cH9Wm5ZjYz3L3X; Wed, 03 Sep 2025 18:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756922740; 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=+fpEaUBAOoKPbPB2fAMJa/datftLgtI12V5pZkmK4Co=; b=ufvzhH2CmMUtiXDtKs/EUaGvSVeFir34DaezrEGQRM/yzVxnPYlQCcFY7U71Li4eaSymKn 5OXNX23jdkTxM9g8kWi/ATtl8UQ0FJ6YzUYMxHNa01c6v01cKaLz+aZeJDRoZQGvbCKpdw VWiDVDidjY1BHpSgZg858a2OJqOCNzllQVkPpVGAtO8sGcPG9HlCZZ92vGgLduad3wOUZ+ 8Wup7Kr8OfK3MdUChe/B5iv2WJBp18Npq765Dp0s0ZfVrs+8ZMHwWrg3EZI3l5DQcdUnDe BnZFrEgyrhtiMlHfC5ERJ0BZhifcnQ62X2N9PXaGpRhCbJZyADbCG9fNMah8zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756922740; 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=+fpEaUBAOoKPbPB2fAMJa/datftLgtI12V5pZkmK4Co=; b=qktXuvpobAu6/bjnovIqveYXFBuOIiOHH3SRbUalhieBM5KZ1Icq4SvyayTnS0zkiI4/Cq l9hiDAESDpeyrfCzpKhqa28UofcQ2NO45wh3BSej5gR2kr8g9z/8WSyRLWxdHB+HW6dLLf 7/GBI6rXtEJ6FRmauhQQcLqqpCDNWd21PSldX64cqHINnezBG5ebs1IzvgkBS/yS5tKkJj 1cRdKZl8k/x0fdVeeUlZcJj0tyxjIR9rBV1HXkB2JNpjUFCudCugzhW95yJBz46EUh79lw cYneeFtorPq3xXSyU1THdyZ9VkMc9upVnLBRlhHgABl5gCTfdT9kT4nO6ho8Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756922740; a=rsa-sha256; cv=none; b=cYDR+vH4vZHMiYxt8szrs2uA0SyyzutpZANfedilX4cK0Oi2fbl/ZpD5m/iJ+7ErAyeG6P 8TdOaPWlk2JH1vgZwyFDQbS2UcK9EGLR7HSqJSYhSJ4vISeTdK3KSptPOy7ODM5AmtBxXO q3weLHD3+0ikqq+G5FVQJznDZnF2Eitw/edhNBnGTkGP/AnkLwRE4w5he62u9qGaGWXJU9 jGbAyuH7yOELAAfZnJe8dsqEG5D278XspH72QwqffWCjkiwkslg4KuZS+dEvjKBeInCr9K XNOqGJz+cFCtXDkJGI7epN5bKhg+TacpaCT8tZdtaiCxAB/ELmbqhfwnANWlGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cH9Wm4wcyzBmw; Wed, 03 Sep 2025 18:05:40 +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 583I5edW005044; Wed, 3 Sep 2025 18:05:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583I5efL005041; Wed, 3 Sep 2025 18:05:40 GMT (envelope-from git) Date: Wed, 3 Sep 2025 18:05:40 GMT Message-Id: <202509031805.583I5efL005041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 7b3094df479f - stable/14 - IfAPI: restore KBI after bceb9c2f2b19 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: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b3094df479fd820eb7a2bd3948619a9eaf77665 Auto-Submitted: auto-generated The branch stable/14 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=7b3094df479fd820eb7a2bd3948619a9eaf77665 commit 7b3094df479fd820eb7a2bd3948619a9eaf77665 Author: Ka Ho Ng AuthorDate: 2025-09-03 17:59:01 +0000 Commit: Ka Ho Ng CommitDate: 2025-09-03 18:04:07 +0000 IfAPI: restore KBI after bceb9c2f2b19 This commit restores if_bpfmtap and if_etherbpfmtap functions, and implement them as wrappers around bpf_mtap_if and ether_bpf_mtap_if funcitons. Fixes: bceb9c2f2b19 Sponsored by: Juniper Networks, Inc. --- sys/net/if.c | 12 ++++++++++++ sys/net/if_var.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/sys/net/if.c b/sys/net/if.c index f308edd24734..a3fb237e3f96 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4866,6 +4866,18 @@ if_gethandle(u_char type) return (if_alloc(type)); } +void +if_bpfmtap(if_t ifp, struct mbuf *m) +{ + bpf_mtap_if(ifp, m); +} + +void +if_etherbpfmtap(if_t ifp, struct mbuf *m) +{ + ether_bpf_mtap_if(ifp, m); +} + void if_vlancap(if_t ifp) { diff --git a/sys/net/if_var.h b/sys/net/if_var.h index b8a0b3d3fcd1..74692e916558 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -629,6 +629,8 @@ int if_vlantrunkinuse(if_t ifp); caddr_t if_getlladdr(const if_t ifp); struct vnet *if_getvnet(const if_t ifp); void *if_gethandle(u_char); +void if_bpfmtap(if_t ifp, struct mbuf *m); +void if_etherbpfmtap(if_t ifp, struct mbuf *m); void if_vlancap(if_t ifp); int if_transmit(if_t ifp, struct mbuf *m); void if_init(if_t ifp, void *ctx);