From nobody Wed Feb 8 10:06:41 2023 X-Original-To: dev-commits-src-main@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 4PBbJ13pMQz3mykp; Wed, 8 Feb 2023 10:06:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PBbJ12mZlz3wXy; Wed, 8 Feb 2023 10:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675850801; 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=IgygRiMr00Hgei1nq7MKnkNgSyQjE0TyAei58VZBj8k=; b=RVzihfYxrUW4B+5uM1fQA+bWJyiSpNp48cyo3zJ/sk0yFC3D2nI/lUbvgXiJPBPPXInaZs CsOMlkYWis2p2eDmucthZAV2rTOwX4xzKwOPw3FlsMMarmUyK5DXwoAKq3wZE4FNDcbtuf zdVqHs7dXpeZ5GT7VHwO87hA7Akc2ZaiHqgwHzvghI4/FuHTM/h+r3QntlDhIh7Jd7b5aq nQqqtr2g0aTz8cUrqRZPahktkEXf124CatcCG9rEODJms01FQ9WAjyutm7NOZO5rg5Fx2K ix/oo/K4ntZYOEtEk4M9BFskC89g2iJPL9SCjzgnZWh1u0Q8m9GkjJBRTM2QcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675850801; 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=IgygRiMr00Hgei1nq7MKnkNgSyQjE0TyAei58VZBj8k=; b=TF8ltXrLUU58H1Nf52rZ0CdhoQxh6WVZZCBT/u1uapHFItlmzCivLMLCCJDzCZWjGV/QoA AnrmdjJXpCkOeOjCe2tZhVw7dmFNIJdGF8agrCnBoPf7uhtFs7D39ia9356EV6DajnAJm9 X03AuW9mbVHmJ+YyT0rr7WOsBkWQN6u0zT6uQVkoQJ/uYaiFaxMVyQRWTkMAvgTsWzhMdI t3n0DhdIy/efjyGy4BC3kiU2DqZ1T6KFwtLY82tpqx91WqaUtYRLE5jNecpZPPmyHSu6fX aYOsz5wTEdkv2wA/aiN7v5a7EyvLJ9NeS6W/423dCMSXfuiej8Fl6VU4eRxLSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675850801; a=rsa-sha256; cv=none; b=XRG8AdwAEB0mKzm2JnQvWIIS6ADnMi0ix5ouPeSTTx1RX0TP9B3IFD+UaAUQIs/ytXUr+N pS+D5YW79kmjs/kqezTzDvvn+Dj5akuO3AyQdFy0i5PyGQNJx7cZkma/oMZ8ikXFTURqx9 +Fst05NebA4P4IsUbRILgiemypHqsyP1yF8EBd0dQMP21Czf5TB2X76pxFQFBPqsi+yU+2 Q7zRdZJns+qxmslSAhGfzlgMpegOqpOTRouACbwdi0qQZkqjcz9ehcPZz9hWZuG1jAv884 +pxzglcdthWeLK52cjzWQ2xZ2+5Hk1PUWjIa9nU1yD9/6pdvCYO/KMCTxQ39vA== 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 4PBbJ11kTdzsWt; Wed, 8 Feb 2023 10:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 318A6fgQ024297; Wed, 8 Feb 2023 10:06:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 318A6fFG024296; Wed, 8 Feb 2023 10:06:41 GMT (envelope-from git) Date: Wed, 8 Feb 2023 10:06:41 GMT Message-Id: <202302081006.318A6fFG024296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 9df6eeabb379 - main - bpf: Add missing NOP stubs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9df6eeabb379b0816d58b05a4de24fc0478e1dba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9df6eeabb379b0816d58b05a4de24fc0478e1dba commit 9df6eeabb379b0816d58b05a4de24fc0478e1dba Author: Zhenlei Huang AuthorDate: 2023-02-08 04:35:02 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-08 10:05:21 +0000 bpf: Add missing NOP stubs This fixes kernel build with nodevice bpf [1]. [1] https://lists.freebsd.org/archives/freebsd-current/2023-February/003178.html Reported by: Gary Jennejohn Reviewed by: jhibbits Fixes: 950cc1f44fbd bpf: Add "_if" tap APIs Differential Revision: https://reviews.freebsd.org/D38432 --- sys/net/bpf.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index ffac63ef95d9..43eed04375d7 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -3120,16 +3120,31 @@ bpf_tap(struct bpf_if *bp, u_char *pkt, u_int pktlen) { } +void +bpf_tap_if(if_t ifp, u_char *pkt, u_int pktlen) +{ +} + void bpf_mtap(struct bpf_if *bp, struct mbuf *m) { } +void +bpf_mtap_if(if_t ifp, struct mbuf *m) +{ +} + void bpf_mtap2(struct bpf_if *bp, void *d, u_int l, struct mbuf *m) { } +void +bpf_mtap2_if(if_t ifp, void *data, u_int dlen, struct mbuf *m) +{ +} + void bpfattach(struct ifnet *ifp, u_int dlt, u_int hdrlen) {