From nobody Fri Jan 12 17:01:47 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 4TBSW01wvLz579KV; Fri, 12 Jan 2024 17:01:48 +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 4TBSW00WYcz4YTY; Fri, 12 Jan 2024 17:01:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705078908; 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=FQCCMdLYrCrcZ1ocZwtvWXozz5dvK2C6nc0QqMoXscI=; b=XAMLB7tfmr9xde9qP9DsE/xV2sFH02KPRFLoUZljfdVcWj+1ii18TjKQfA47n0WX/C2grp JSWxupKwpaL6nhFKBI7V0v7n7m3didLf6fnjmjqWWi+Enopsgui1ygXdO5GOtpQ+SyzmNd x3nUtSw54h+pfwkW3LnMjY8CPXr2sQugJ8yYjxDRHJJ/Ffmi1WJhWoES2V0PeRIJ0bvU/D 8TuJtcQtG9s8Esc1libHogCXeh2V4rXrSMkhMnZn7q1pZisXrMvpiHR1q+Xetd4amVnm2n w+xXAVZLhJOgfOtzw2gB/Hc82XdIS9VMmgRZVvhoH8UVYI3y/5fpUyJxVGU8NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705078908; 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=FQCCMdLYrCrcZ1ocZwtvWXozz5dvK2C6nc0QqMoXscI=; b=a1toEqwjwH/99nSzYVogKPqHycs1lLFUTOMcF3MFHmlsGDOOxl6/gasP5xhoWM113RvWaU /mHfSq8H80vnwSirMDAsyFElMEyLoFTuW3FVmrfjq/PXUsUbuf0D2Wkh4s0bvM9N/8QhFr FroAVVR1loEBqH5ZuNZh4Tjg65fZSy/2lMuCgkPSvunYUCadksR75qkyXbdkixQx8k/9SL yVe6iP5AvpaLn3dBytCetHGVvHmE/1EN0asRaMGaTPYpfKGocywaf3tPGIyZpNRVd4qFsE 28p/U3lfdvrg3g8gYhBLabBMLvOk0g0QiBY0SVvS1tlJZB4v1rnUNozv3wkLVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705078908; a=rsa-sha256; cv=none; b=pT4JelkKvJnFnltZa76VsAV0lMls1VglzTgoFYbp//y7Cl1SWNXjSq2R1IxG0J3bMJmCyo Y0jZPxW5ukkHjZqDLn0f32w+pKClUtqQb+LzqkcKnd5Am0R6lqaZEcXjASSKmYs5+/ye7E Fn7PH3lqk5x0bkfTN5lwEEUWEvN5rZj1sZvD3Zz2+qUoPJzIMSyhQg5Vwuo36/E/rhXRNL eS1wLtHDRfa3t6wnZ9P268hOJKBv0t8dw3QaRKInWdOV2t3ogn9UVBWeCN1cSPT/yghGTI XEDDPF2j9Ejdur8ZwRCuWt765KqChPu16hiBwk44Bb/nm8UmIV9XkahqzSDAJA== 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 4TBSVz6kBGz19Ns; Fri, 12 Jan 2024 17:01:47 +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 40CH1l30010041; Fri, 12 Jan 2024 17:01:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CH1lYC010039; Fri, 12 Jan 2024 17:01:47 GMT (envelope-from git) Date: Fri, 12 Jan 2024 17:01:47 GMT Message-Id: <202401121701.40CH1lYC010039@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: 83e524e8f656 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 83e524e8f6567f7f336304eb3f2f9ceeea68cd66 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=83e524e8f6567f7f336304eb3f2f9ceeea68cd66 commit 83e524e8f6567f7f336304eb3f2f9ceeea68cd66 Author: Michael Tuexen AuthorDate: 2023-11-09 10:43:54 +0000 Commit: Michael Tuexen CommitDate: 2024-01-12 16:59:27 +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 738e6b997ace..0de5b0d2d521 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);