From nobody Sat Nov 4 09:39:37 2023 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 4SMsyd2Rv8z4yfp4; Sat, 4 Nov 2023 09:39:37 +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 4SMsyd22Ktz3GR2; Sat, 4 Nov 2023 09:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699090777; 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=6l4pQvCEcyOT7i6eZ9Zu1/3IAyWg+w5W8MaBQFCyT2Q=; b=OwF1hu4c94aOs4/lt4BisqpEk2TzBydagqsB6X+YJlIdYLw3Ujyt041FsJBELcIW7szuS5 YtN9/m8XP/7cy08yjl0qMd3WNOK2X2543eav2/lh63+5igELmHvHmf/x4jxOo4vbbeWPZJ LikAZPijmZG2bywdXEp4V5yW9dD7/aky2xmf5szOqoqVcTyRJN1HUZ/TwHaXqtWxKoeFlX 4ViW1QWUBjY1QFOqu1UOaGnPHdJNzTT9+t3e7thW9NnR418ZKPx9VvHEtM6Wo9HJC1FnPJ CjV1+zYZeGvBtO4JKuXop6vThbC99SE40CrzsS+Eb5tX3EfeCm12OlHy0ff8BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699090777; 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=6l4pQvCEcyOT7i6eZ9Zu1/3IAyWg+w5W8MaBQFCyT2Q=; b=rS77p6uVW2AZSytBk9vd9A83DWlaNvyHghfgNbKB/P5OuCiZ8GoKBNtrjDV6Ep/nzRlNFc qiIhemJ+ZU98K2p9Gyusc+ETo67fSfsdGHVmukBFIkGk+9OuvoAKS2ClZVj3R8lFabCUyD 2Sd83ZgYVf7+uHkyk+2o6fUnSnjpSIPbQ2PW3meSUDJ3gdksN+V8D7Kv6vvUlSRy1Xb4z1 OykisgyQyTCb1vsU21HgFfWFS/HZEPGE/95uV2KdY0NJxZkXvZkhNmKTYhRm0uu0vMAZuL 6CTJxkZRdQ6dq4QHa4WSIFrIeTfXdFasqtePEuynEK+ljtKPpMFUGG0pN2lxvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699090777; a=rsa-sha256; cv=none; b=aLZDgXSivd4PLzOk+zPBir/q6/XlGEXNjBCB0h+KulaCrfYlou4wAVRNxY5V7/GaYK4FPM Qwnb+P0uGW8SiAQ6szdQgEHgEMT0bYyGvDo9UgeIcUrz1k2E4TsvwJ892/K1bYcEfW68vz gGpol+NK/JLElNqCfNynY8iyQUVlmSeHzalTqWsYEfeHWqKQjKOT07FcHnEtf6PWA4fhg9 ZD2aVoe3KvkzihX5Hr6/Ho0ceyBfzCI6m/YippPxy4VzUtpxWnELV1PebPRoJjlZUm+ZfE UU/OV8kOiTUWYBIyuXJr1Sie1G11NDGicyueHs0+H6BdnKpc9spxC5HAahQWTg== 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 4SMsyd17pRzsNc; Sat, 4 Nov 2023 09:39:37 +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 3A49dbVe036745; Sat, 4 Nov 2023 09:39:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A49dboh036742; Sat, 4 Nov 2023 09:39:37 GMT (envelope-from git) Date: Sat, 4 Nov 2023 09:39:37 GMT Message-Id: <202311040939.3A49dboh036742@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 4ffe410e40e9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4ffe410e40e90c265c20cb4675ed74a40dc1fcc4 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4ffe410e40e90c265c20cb4675ed74a40dc1fcc4 commit 4ffe410e40e90c265c20cb4675ed74a40dc1fcc4 Author: Michael Tuexen AuthorDate: 2023-11-04 09:22:42 +0000 Commit: Michael Tuexen CommitDate: 2023-11-04 09:22:42 +0000 if_tuntap: improve code consistency No functional change intended. Reviewed by: rscheff MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D42462 --- 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 a01bc11aa64c..3eeaadb83a20 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -1413,8 +1413,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) {