From nobody Sun Aug 11 23:03:02 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 4WhtTy2YsLz5SR7Y; Sun, 11 Aug 2024 23:03:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WhtTy20C0z442Q; Sun, 11 Aug 2024 23:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723417382; 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=9GVuwnhLZZjMIN1pNaR0+xyujIgVe44uyetBOAerMcM=; b=xbX6KSf22fYOet81FH/A4fw4l6akgPao5SsYLYVMpoJ7ezvyBGGa6FbebBcj7x5A3GDoGJ Qo4eG6hBSyRQGfZf1Wt4xLwNCmGL+7VpeMPE4mdBBcdpj4pDtzSAlyUTz5cDc2S7NexTxj EL3EEj+jIsvHw1/bTWN/+Sy/M88snH63A0g5TJfTU38jBPCrpkaX3KXQTmG/tQH+Cdjcqh Mqu1G1QEVpL05ZlviENC/MlFtxSTv6lK/z7fMHiCrMvvPYSpCgc5EIcgDSiNKs+/2VdTyI OBBN7mBHwLK3SkUB33wl4SUOWJq2xVq97b4GlAS3JxT10oYgWFzSRlqjLM+mBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723417382; a=rsa-sha256; cv=none; b=kspoUgy8pxfzrHidlxlSm9n4gOwx0MYaawRqKmefOnWHNZR+Ylgs5fXtIfbsHyevxT7XrC OXC2DbqeD853tAu27C7d98qanSA/WNRexhheJZE5cqhbd1GC5M2MNjixfH/EAr5ZFjME63 SB7sUPpfKF2X+aDyEwWHcwVjBos4DuQQlzjxzreTya/E0oa8Ybw2qjrHNw65FSSoIcxL5c IqrVeNxlSdbYjiWtUJ2EgdUqb/vSyjwDRqz/b8iqa/Q3dWp6F/hRzNq8U6cBu+PQQseGxU om/ZNRhk8Jsl6pnGpgOa7s36F5lnxTptJcQqrn6SXlyOKu0ZT/HI1rL4heoHjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723417382; 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=9GVuwnhLZZjMIN1pNaR0+xyujIgVe44uyetBOAerMcM=; b=U2SpDZmP8dyQs7GR8Q/7qfa47ARN9HPfhB5b/+8HokexHkP0hkzFQy7Xj0htxdbk9hErMx hCOa6gJo5yDjk1X3NfatB79dISLM8aIFxlFsstC/vVk9uPToLzJ2OC9MU6aBalIVAjv2PY RS3SflLqiwt1q0Ynn8jeS3dF3RrNCnzLrcvqJ8lugvUmQui9mo2OJOY/xJCLxD7fBeTGDD iqLA3IsNxn3xdHLTLNp8ZcpmrgqOdE7xT3J5SfuZuugFrOTd/M7tVs81Yi2xjEPOQP4ity ZyM5afv0KnjVd2/HTR1pYit4LDrDuF98AvjDI0aeip3XEll2rz5Wug2R6zRfow== 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 4WhtTy1cJkz133N; Sun, 11 Aug 2024 23:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47BN3211032256; Sun, 11 Aug 2024 23:03:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47BN32ha032253; Sun, 11 Aug 2024 23:03:02 GMT (envelope-from git) Date: Sun, 11 Aug 2024 23:03:02 GMT Message-Id: <202408112303.47BN32ha032253@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6fb0634bc4ce - stable/14 - linuxkpi: use canonical tests for is_{zero,broadcast}_ether_addr 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6fb0634bc4ce5fe32312a53031e56fe866b0b24d Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6fb0634bc4ce5fe32312a53031e56fe866b0b24d commit 6fb0634bc4ce5fe32312a53031e56fe866b0b24d Author: Ed Maste AuthorDate: 2024-08-08 00:00:00 +0000 Commit: Ed Maste CommitDate: 2024-08-11 23:01:51 +0000 linuxkpi: use canonical tests for is_{zero,broadcast}_ether_addr They are functionally equivalent, but the updated form mirrors the tests in sys/net/ethernet.h and avoids confusion. Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D21037 (cherry picked from commit a1295b24842d209e6bf93a4823193d56ad2db064) --- sys/compat/linuxkpi/common/include/linux/etherdevice.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/etherdevice.h b/sys/compat/linuxkpi/common/include/linux/etherdevice.h index 89cd4c8e0ba0..5d3df744ae0e 100644 --- a/sys/compat/linuxkpi/common/include/linux/etherdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/etherdevice.h @@ -53,7 +53,8 @@ struct ethtool_modinfo { static inline bool is_zero_ether_addr(const u8 * addr) { - return ((addr[0] + addr[1] + addr[2] + addr[3] + addr[4] + addr[5]) == 0x00); + return ((addr[0] | addr[1] | addr[2] | addr[3] | addr[4] | addr[5]) == + 0x00); } static inline bool @@ -65,7 +66,8 @@ is_multicast_ether_addr(const u8 * addr) static inline bool is_broadcast_ether_addr(const u8 * addr) { - return ((addr[0] + addr[1] + addr[2] + addr[3] + addr[4] + addr[5]) == (6 * 0xff)); + return ((addr[0] & addr[1] & addr[2] & addr[3] & addr[4] & addr[5]) == + 0xff); } static inline bool