From nobody Fri Jan 12 16:50:59 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 4TBSGW40q2z578WM; Fri, 12 Jan 2024 16:50:59 +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 4TBSGW3W9bz4X5Z; Fri, 12 Jan 2024 16:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705078259; 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=q9mevGSkwFZIv3l8WwRTQlxEs2Wvf2wiXiZen898kFs=; b=sTaATeinOv8Mp3+asRkitMx2xEPgEXeirDv053FZKS6X2vy669nEAyyhqfCPB61E3eeFhn IofnpGLLwKXVyOYyFfO0d6UTS7IE5y96bMAUmdxafiaIdIWDdr3LqRu96slz28D/T1Lp9W 0u4eAEKstYIqWNkch++JpUPLsTpDyYSDCj+k+ODhAnnNRjV5POJn6wUtilBYbY+F0qk9js WDAZVAQlmaVlHOX/kZUAkjlk09woW6f57L5TUR14g0e+mwSdl+cYD3qh+jksSnbMVvoSRY UhRixQM505BMhamTneSif8O/PQf8wyU0RPNlre98EMBwdjsnnInKB958m9pTKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705078259; 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=q9mevGSkwFZIv3l8WwRTQlxEs2Wvf2wiXiZen898kFs=; b=qKwgdmNOmyBKxs1KvV8kg6roRKGYaA/b//EOHvXJXoVy5S0MnAimg55j6/XkCkBQmgRRyx QEoOST4gc6QPfMAwl/WnOTgx2+eOTL1noeX1dhl6y9uvDGyWt/KGixv+jvldCaIdg4FGO6 bbhu5u3jn5+PnvQbCrUD2Y49vzH7Ui7G7bvZdAgxegG/73JAn1FphSEAqcdCu13+JrYIDE +zcYhYKYEr+Fwadx/cULjHCFg0UzXvznq6hScBYHbLzis/N8LqahAwwSEGQnBNwR7fCtGT 1DPgEowgiSgQN1NIq0328yXmTY+D8J+5xGDZg+0UQemWJUOoCtR/kw1uDhCNZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705078259; a=rsa-sha256; cv=none; b=X5MPW63uT2LHk0oqiObSM8orJyK0R34HpTlfPmbvv8Bc24griATrUUsX6SRr6uNVx7HLRB Bp/sDOZlcMYS8tojuW9vPbjjSrz2tOmlpb5cf3QDni0EP4pLlmxBwNPRH2MCYzKhMAdWG+ FB/BFaOHHUwXnIXbMqLBJYPOTCYwJhuzkpz5YenCzxsI+kx6F1JmeRvbhUPYwSqLhSnsmu TXYDDpt+15mmHqCLjY4CWgdoV474nsroC3OaWHtIelvswvWJmT7kpKHlG8bzMfkWi3hogG KcimQxMXFs8eEkC+J2LKGM9+1CTwtug36lDlOLGtov9V/KBCTSkcgNQOdpQlEQ== 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 4TBSGW2YvQz18rF; Fri, 12 Jan 2024 16:50:59 +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 40CGox4l089387; Fri, 12 Jan 2024 16:50:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CGoxCP089385; Fri, 12 Jan 2024 16:50:59 GMT (envelope-from git) Date: Fri, 12 Jan 2024 16:50:59 GMT Message-Id: <202401121650.40CGoxCP089385@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: e71e4d9ef1ba - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: e71e4d9ef1ba26f054894465fd53684c1fe2154d Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e71e4d9ef1ba26f054894465fd53684c1fe2154d commit e71e4d9ef1ba26f054894465fd53684c1fe2154d Author: Michael Tuexen AuthorDate: 2023-11-04 09:22:42 +0000 Commit: Michael Tuexen CommitDate: 2024-01-12 16:40:30 +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 a1d9929a2e28..298f37bebc56 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) {