From nobody Fri Jan 12 17:54:25 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 4TBTgj5wH2z57Fhf; Fri, 12 Jan 2024 17:54:25 +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 4TBTgj5N3wz4lRt; Fri, 12 Jan 2024 17:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705082065; 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=ypLR3s1Ga7ufcE98LpytK3fMOsy/tiWG51DBgmmaw6E=; b=xTDZRVrIuqkVpA+cb8D9t+KmNS0Z7WuC2/s+/NhH3h6iRO8zbnVk3QTpdEfsgiv6vO929I 04o+xLN5d/1yyWJCvmYj706VTy7WKZMfBctfxSaRlpM5LmZOgL9BmHSPo3XymBGGlVPV3T UQs8z5N7kj5Ot1KmHIpjAKwGgsqOP40KfImo/Vw3N1spcjK8q4yuFHcxFjJO3tdisOhClx zuNODUcvBgilqUSh/Dfb5IpvMyy05SiYo8hvrOM30asJL/Gg4I8r2PfWzc+aRUfjT24e+X HM2YE2l3dR7nPhwLI7cJR8oH96koYteUeklF6j8xFE3h4BIDj8osTfpzvWlO6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705082065; 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=ypLR3s1Ga7ufcE98LpytK3fMOsy/tiWG51DBgmmaw6E=; b=bFbPRXvEB9Eu0A5tEPl4Hg/YonXbgleoby5ERRIFhAZB/4FYxuj1yNclixt948qB426gwA bsevExyP7yKVwUzai79S5hh9tzr6iaiKdBDAFkFklYD1eW4r+WzQctGDNveajejqm1vmYU JmtDC96UtpvikdY0Vr8DxhGS4seUMyC+Mc0DKhGOByeaEtiB0rVxRXXQla/MWVviGJomTk 21A9J+LZynYDp6firD8qfAlByMUjPGgD+E6sMPNeAYETNtJsOt7ET7GsxxOuEedR0i3D9c 8cY5qmqOIRqxjvVxlRKW1Z5JWuvgXNr7lLG53gdp+EtpFlL/aJozdKZEw/MOeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705082065; a=rsa-sha256; cv=none; b=dMEY2JX+3J2OKGp+Zuzh4oO8P0pKoDZDAA2ADe4Gu2QNKj06HsRcNPh37OhIoaNyEoQNby Qje+WRS3z94JLNRqnFAH0r81ViS3VAJXhkTOAiBhm8tRRN+fieYhWnmfL8xJnBf5RZKbxl TP9MxH3vuF4kJtzniDyPUT0hSvlUxASqoPpKzXCWZXBFQi93YECZ9JR/aFSCTAHnP9wcWI olQhan8eBiApC5cK+d5onBr7O0Kv0HBDWCq7mjpOXNFEaVG0aLSsGX0m08839ij3PRwJRl nCfUW1lTxKYobqzfRVtXTUNlwG1/CbqewiQf+xbLtrPad/morkQQ+mzxul66sQ== 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 4TBTgj4R6Xz1BnP; Fri, 12 Jan 2024 17:54:25 +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 40CHsPOd000086; Fri, 12 Jan 2024 17:54:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CHsPQ8000083; Fri, 12 Jan 2024 17:54:25 GMT (envelope-from git) Date: Fri, 12 Jan 2024 17:54:25 GMT Message-Id: <202401121754.40CHsPQ8000083@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: 7fe50d188806 - stable/13 - if_tuntap: remove redundant check 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: 7fe50d188806a49da30fedd1f3f6d8fad1100b95 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7fe50d188806a49da30fedd1f3f6d8fad1100b95 commit 7fe50d188806a49da30fedd1f3f6d8fad1100b95 Author: Michael Tuexen AuthorDate: 2023-11-09 10:43:54 +0000 Commit: Michael Tuexen CommitDate: 2024-01-12 17:54:01 +0000 if_tuntap: remove redundant check eh can't be NULL, so there is no need to check for it. Reported by: zlei Sponsored by: Netflix, Inc. (cherry picked from commit 44669b76504991ef3ac10ef10bc0fa931ae79c45) --- 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 9cadd971eb37..28b8454c2894 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -1772,7 +1772,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);