From nobody Thu Nov 09 14:49:30 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 4SR4bv07yvz4yyHQ; Thu, 9 Nov 2023 14:49:31 +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 4SR4bt6pBMz3TPW; Thu, 9 Nov 2023 14:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699541371; 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=J+pKcVEzLs7exjj7PpqzcfQ/N1Df0X6Mn8CeorEi5sU=; b=epDqMWokT/3yz9MRjbRf1Qm28Yslbg1XenuJPr6YiDMiKKJQwu31tbvDEjBRF68YJVSWBy 2PeVBYStlF2/iLTKCxWKLij8EPsOSRbqOoKr4FaMRJeu2x4+u9QFoKlQ+Lp6/AH9uameeF 3QLpUyRh03PPlbyJfp+lYJhnIE4hTjzYSuF1kOAMwsGCA3E+/+T3AAMdz2H/53aiJ/EwBx uSEvJSub/2AgCsYaB8Z4LqrjwF3JJGNq5aVQAY6Lp79iFLIV6TXEWADmlALiz64z5h7j9t ygPNiwMG25wufjTQal5FPmTUnN46TtpRrmXNV1Ysy7+JZW587dJrDPcLwLEZEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699541371; 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=J+pKcVEzLs7exjj7PpqzcfQ/N1Df0X6Mn8CeorEi5sU=; b=CyBhPUzqTo+5fmtlsPNT2feEl9QoRaBFMH1JX3toHB+s6Z+gJQiB1z3m6xZLIxF2nSEtg3 r6zLCFslIDbg4RNyD/d2ltD8dRClgC6bYsA3VdIsVkpbB39khsT1bKC8FV2xzoCJSVPgut aKE8dWyGFXfIlB8YPwuqXgu6LNv3tVllJEh31ykABiiGCg9uk9BBqoM08+fs8EpOWi5NYi gyecznsffT4LjvrFdxuvCfqm5TTMPSZyOf2tHYNbfRbqDMt0njkeMJkDVFvJIQqjaj/x+4 tpNrtY/Sczp2J2wVHDmmfanPPJvO9dmQkW8PV1jv94aRAAT52Gxvc7ItbfD9+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699541371; a=rsa-sha256; cv=none; b=TxPSvmMNoIEE2ZkpMe0qyl1/ou+303QTLeHrHsmDOLQ1C2x0Z6X48V/zJd2GQvvIudh/z5 dGaRWvpn8IAlgLfvtnHcTAeMqMG3Wcc+uK1qWQYXUZfODuQ+hPE4weg+v5gnJMN6Zzl8la 284BhBh19yKbq6wva8+2p9TY/0I/Gw6bMu1jrdBiSDpJi9NLgqDaXw2MNZre5FDjp+Pauh enrQ5GSmPgPpMO0zzmhxwS3ta5kI+kfZXgJ0pkPaYwVGqaP/nw3klDieZ/JJDbhJKJQG4k tmWideWJrdW+XmqMTRru9vJ2p+/xYod+LZ3etjn6qFfebv8p2kpOTdVTLXZK3A== 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 4SR4bt5s5Qz4v8; Thu, 9 Nov 2023 14:49:30 +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 3A9EnUOA082311; Thu, 9 Nov 2023 14:49:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9EnUlZ082308; Thu, 9 Nov 2023 14:49:30 GMT (envelope-from git) Date: Thu, 9 Nov 2023 14:49:30 GMT Message-Id: <202311091449.3A9EnUlZ082308@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: 44669b765049 - main - if_tuntap: remove redundant check 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44669b76504991ef3ac10ef10bc0fa931ae79c45 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=44669b76504991ef3ac10ef10bc0fa931ae79c45 commit 44669b76504991ef3ac10ef10bc0fa931ae79c45 Author: Michael Tuexen AuthorDate: 2023-11-09 10:43:54 +0000 Commit: Michael Tuexen CommitDate: 2023-11-09 10:43:54 +0000 if_tuntap: remove redundant check eh can't be NULL, so there is no need to check for it. Reported by: zlei MFC after: 1 week Sponsored by: Netflix, Inc. --- sys/net/if_tuntap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index 30d1d84b2f59..8881bbaec070 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -1779,7 +1779,7 @@ tunwrite_l2(struct tuntap_softc *tp, struct mbuf *m, eh = mtod(m, struct ether_header *); - if (eh && (ifp->if_flags & IFF_PROMISC) == 0 && + if ((ifp->if_flags & IFF_PROMISC) == 0 && !ETHER_IS_MULTICAST(eh->ether_dhost) && bcmp(eh->ether_dhost, IF_LLADDR(ifp), ETHER_ADDR_LEN) != 0) { m_freem(m);