From nobody Fri Jan 12 17:52:18 2024 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 4TBTdG6ZYKz57FV1; Fri, 12 Jan 2024 17:52:18 +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 4TBTdG5ZK2z4kSH; Fri, 12 Jan 2024 17:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705081938; 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=D7j97GSusO0CWV7UR5yVQF47NUsY3f58+iBx4T4WNRw=; b=kVLykXSnEtItAlVtlwt2ZJXCSd3Yeko/YWi6tD6BfdawGAGNdHWN8gXuJqj+6oxetXWExD 8gfsP1YeBVDNwxAOOAsTk7oXoSa29VgSy5t/a5iDyTFw4VwFBn69gaSUBa+R41RSIVylTQ Yzy9B235tNv3HBJOd3zDmSbo8qycgJ9LCt0Kx5E1ST/55064wD07GaiRicGNPD226rlh3a b0x2XbYIyut9llZ9lbExnT25vRd2uc5WTRMYOvkJh4MLqA5Q+D590iqsPfRJNtTpcGWFiZ 30pdxEkwTpw4iQYnoK3S/fWWdP7Li6kE2VQmbHZyVBkKuROp1tR2k5O+17LF6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705081938; 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=D7j97GSusO0CWV7UR5yVQF47NUsY3f58+iBx4T4WNRw=; b=csdh44nC5AaCkAwx67pOCQbtkwIdF9SnsPzCO3cxdnOOBQGM3JxUz3Dh1H4IudNn1fx4hK fWftzvKtU4IiBmoEa5sooIRo9CplLAd+a/s7ndbJOI5YXHdKXwPiTGuvm7a/KfAiNIMM6d 2MbmKgGIXaTS+SkP0iJFQ9wAfg4DEp2nE3sJPyJ4Kf/rbgG0VeOQJl+eTfpEa6kJJQooc4 oLz+fD9N3nNFZmkYHvHgs9ZJa6/ckdNCCOXbzLc7me7YJ2YPux5XdzW9DqvtAFTmGPALnc kxh+tQ8p5Zm0AFz4OQkkZhSbvlb3iwP8G79OzhWvK+oE/KO0X+cL3zpNZ9U5yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705081938; a=rsa-sha256; cv=none; b=iev7AgEf7PuIvO38JuTxeOim7ZmsE5+bFMMGR3lZu4PBpGOJmZhpFywBoIGx/k8eThgZpP /VCa30vG2EOJAtKf+Aoe4hcpvGc0Fyw/vF8OrsSH5Y9XQYETbul6LIqY47HQCeJ4M84NPW qfwRQ+xrs9yPVXvDlx97BMDx9QLgIx5p6r62KkX68s0m5Bg5cgGzmeMs+z9rVbfs2MUD1k FQnokWBHCbfIjdVOMFtf4sl2qBAe8GMX6ndlqtI1MD9NXUQ7pGDNQxrSX45fOm3jNvTJWq CE+/4NjPNsT8iXTx0PajADM83Z9oTjxN8jAjET7brT92DDEXhXkBFZEKs40yvg== 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 4TBTdG4dDFz1Bwh; Fri, 12 Jan 2024 17:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40CHqIpA098622; Fri, 12 Jan 2024 17:52:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CHqIdq098619; Fri, 12 Jan 2024 17:52:18 GMT (envelope-from git) Date: Fri, 12 Jan 2024 17:52:18 GMT Message-Id: <202401121752.40CHqIdq098619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 4aaf087b879b - stable/13 - if_tuntap: improve code consistency 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4aaf087b879b914a917923fd77a6b15429fd4c77 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4aaf087b879b914a917923fd77a6b15429fd4c77 commit 4aaf087b879b914a917923fd77a6b15429fd4c77 Author: Michael Tuexen AuthorDate: 2023-11-04 09:22:42 +0000 Commit: Michael Tuexen CommitDate: 2024-01-12 17:51:57 +0000 if_tuntap: improve code consistency No functional change intended. Reviewed by: rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D42462 (cherry picked from commit 4ffe410e40e90c265c20cb4675ed74a40dc1fcc4) --- sys/net/if_tuntap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index da55034638d1..d9243ae8bb6c 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -1406,8 +1406,7 @@ tunoutput(struct ifnet *ifp, struct mbuf *m0, const struct sockaddr *dst, else af = RO_GET_FAMILY(ro, dst); - if (bpf_peers_present(ifp->if_bpf)) - bpf_mtap2(ifp->if_bpf, &af, sizeof(af), m0); + BPF_MTAP2(ifp, &af, sizeof(af), m0); /* prepend sockaddr? this may abort if the mbuf allocation fails */ if (cached_tun_flags & TUN_LMODE) {