From nobody Wed Sep 3 18:57:52 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 4cHBh04FPCz66x7Q; Wed, 03 Sep 2025 18:57:52 +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 4cHBh029gMz3QGs; Wed, 03 Sep 2025 18:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756925872; 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=/Bx0suy7kHwBJ3cmri5uiKnaF9CMURK588m6B1dCsAA=; b=IlWtrcVnN6oQFBkS1FRHYsC0juqKtqbW8TZljbiNw9ZgxZChswqSVMeDNqVUM1QaCJiNnc fZ39HEXnRFaTg57FFOzqldLUyJWsRdUwcpoeqGPiqodKs9x8Gn+2mY1oMbF0SIP5SjKUub mmA8mB+miMi71t6mLxUf253knvqKWSMeXNwQx8PFnrkp9Iuqk44yh4s8kEuXzskH2yIzus ZjZG8JdI1CsKjyl8iYfq4RXvfzSJtlPDz4wiIY3sfKypzogDQaN6yoaHAm+sGARsxHf8Ow pg8EK2K/l84ezV/jCxix/0qgNBW44M19S/sPLfHlIiHf7EoT89HE1hHszCTC6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756925872; 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=/Bx0suy7kHwBJ3cmri5uiKnaF9CMURK588m6B1dCsAA=; b=qokDfFHEwo3WJrgq/NQtn2MMAs+dooYSSnk4BZiOKaVgA0VVBJjqnLwpdxpFyapHxrxAvf s8Exl0CI+nwwiRqPyo3NIKysgwI5ivfFMMsR31Q+lIyXLMgj6vHdtvqJERXs7suheW9o5E Y6AVHjHmlypG13M1/VkGYFoIZZtuZMnmcCcunVMujzWsG4+4iGG5lE6h4yrMqF393qUVsN iPGCm1bkze1FB6WmUrbiTycr/tEofTFke/Xn/EQW3Pl91sjmrj+FdtOs3G70WnzHgdbwqw Ao7RKMl4wW5RhgntJHK/GNBJ23Rf5iRz6I+lpWmQIInrKt+NO5EVFTEiI5Cykw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756925872; a=rsa-sha256; cv=none; b=a8DdCLdk2n/7lFpD0coxunb/LfB1cBi1fSssFkgDdROzlcMwvPPyZsD4NyFgtSNmivFbvy 0beypMlkmY8tGYDnGwzRTB9h7PkoyUj2sujpl3z/iCzlp8Xp2C9/dgG8JNu1YFV3HXmwXW bPiCORYszUow+7lap+zTKBnLcKS9Fkq0G3AgoJrEpz7ryCv0ufzu5vDKMm0fE428GYYE3g O4DIabIyGTsyqFOswVDNMaEBSLDU0WlQGGnYo+suyLgXMA+ZYDDgT68Nd7y48Kbv5YgP7E kDxGTF6mAiMrSSXF3jXwjcsNw98Vf+AfVHAh8thMTyMw8/g6JzuDj1P0bLW1aw== 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 4cHBh01VpczDFX; Wed, 03 Sep 2025 18:57:52 +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 583Ivq04099090; Wed, 3 Sep 2025 18:57:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583IvqfC099087; Wed, 3 Sep 2025 18:57:52 GMT (envelope-from git) Date: Wed, 3 Sep 2025 18:57:52 GMT Message-Id: <202509031857.583IvqfC099087@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: 4f41ff7ced8a - stable/14 - IfAPI: fix 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: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f41ff7ced8a2fa6fc7ba35023b161567323282b Auto-Submitted: auto-generated The branch stable/14 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=4f41ff7ced8a2fa6fc7ba35023b161567323282b commit 4f41ff7ced8a2fa6fc7ba35023b161567323282b Author: Ka Ho Ng AuthorDate: 2025-09-03 18:47:27 +0000 Commit: Ka Ho Ng CommitDate: 2025-09-03 18:47:27 +0000 IfAPI: fix LINT-NOIP build Also, reimplement the wrappers with __strong_reference macro. Fixes: 7b3094df479f Reported by: zlei Sponsored by: Juniper Networks, Inc. Reviewed by: zlei, jhibbits Differential Revision: https://reviews.freebsd.org/D52362 --- sys/net/bpf.c | 2 ++ sys/net/if.c | 12 ------------ sys/net/if_ethersubr.c | 2 ++ 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index de56f3db782f..a5222c3659c7 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -3223,6 +3223,8 @@ bpf_validate(const struct bpf_insn *f, int len) #endif /* !DEV_BPF && !NETGRAPH_BPF */ +__strong_reference(bpf_mtap_if, if_bpfmtap); + #ifdef DDB static void bpf_show_bpf_if(struct bpf_if *bpf_if) diff --git a/sys/net/if.c b/sys/net/if.c index a3fb237e3f96..f308edd24734 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4866,18 +4866,6 @@ 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_ethersubr.c b/sys/net/if_ethersubr.c index baf3a27c2e7e..b0e459dd1bdf 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1545,5 +1545,7 @@ ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr) ether_gen_addr_byname(if_name(ifp), hwaddr); } +__strong_reference(ether_bpf_mtap_if, if_etherbpfmtap); + DECLARE_MODULE(ether, ether_mod, SI_SUB_INIT_IF, SI_ORDER_ANY); MODULE_VERSION(ether, 1);