From nobody Fri Dec 19 00:02:30 2025 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 4dXSQb2N1Tz6K6h4 for ; Fri, 19 Dec 2025 00:02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dXSQb0lfQz43XN for ; Fri, 19 Dec 2025 00:02:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766102551; 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=Bem5vGNrOBFli++BU8OgLnTjh3XOfa8MOypNYInfBQ4=; b=MlMruADS4tgPrbMdCWU34UCa10PCgPmW1QsOEbkxVUqkAoDTDvdCTnONYdd9ljZ5d9ZtKK xf4PvsvYVFpdeW+6fdap+cMZeG3u04HDbnmEUb6ytj25BHiBrugqFbd0Gq78Lp2Z293yPz ad4Ej1aMZS7spiuFyz7omc+hdYUGFIwIfYkf9sqcLrqJl7tZLysOmmi7ldSGVbca68UvLv Vwz9Xi4AVp1jwtno3BcHs3Zo9Qn1NJ63upLuNOBmeAeCSQts9ttibEQQ+oBT8z12aArJX/ z9YvEf8AlhjxJi7Cu8DEpw4R+iT8VFSi3VY1gyWS06Ww6AEb18YXQRKSD8e8+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766102551; 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=Bem5vGNrOBFli++BU8OgLnTjh3XOfa8MOypNYInfBQ4=; b=xJ30gg72vgrzr93yg9Ee97Wpzun55vbaUF3hXWUdMKs7gI/S9XP63vCyncYchy4QSwtIiX TS16tJW2fd4/GZiSBfs7MEI5Z5NIldU8jht76psxuj5/BmgZ9a1BXm7zmg4SGFdK3hPj8c jaWwuZQMOula4XBKBoJQz3Qych9rqrnZwU/uxlx/o/Oir0UcqbME+SajUhKWZDnCL+13wj /3uEhbF57hFuX/cz9B/vpWbl9KZzjKpvIlNDTMYmSGDD2lVFQQG6pApFAYWWBiszoRKExv u9t1/gU3KJDaNjpuVW0b+663MWxnBLAqxBi2ltP0HxYPvJEUjbclgKxi/DBwTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766102551; a=rsa-sha256; cv=none; b=DEDO1O7zWDp850YfrKy55tnm70rbNf0/LxQm7xNVP40tuuVFeurs0FfwCwNVpU0uWUt7fL 99Eu4tXdCPK0kIu/bRIfVAtGML+fl3/NM4NElsIMzS/VQEnD/P7lt3KCif7Cklf+Xm5NTY IpPMWlLcau/Z8ut4VhQjEhhFcpRm3PFfikTQpDIeSP8zHKQ/CtJz+t57h2MQwheO+Ntsvo IZszYfuoa/K3PMYVcNm3JIMZZUgcXl/1P5BWFqYygv+A8oLUVOQYOiss4l0CyBod4DYJgE JsofdF76c2GvLrI5xWjE1sov79PmwqkV1U80jmW0P0iWV0pW8S/Q+Jb8a5TbHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dXSQZ72Dlz10pv for ; Fri, 19 Dec 2025 00:02:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f9fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 00:02:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8c64625d9079 - main - aq(4): Use standard ETHER_ADDR_LEN definition 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/main X-Git-Reftype: branch X-Git-Commit: 8c64625d90792462289686e0209a9f3fff67fc9b Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 00:02:30 +0000 Message-Id: <69449616.f9fd.a3105e1@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8c64625d90792462289686e0209a9f3fff67fc9b commit 8c64625d90792462289686e0209a9f3fff67fc9b Author: Ed Maste AuthorDate: 2025-11-13 22:20:13 +0000 Commit: Ed Maste CommitDate: 2025-12-19 00:01:14 +0000 aq(4): Use standard ETHER_ADDR_LEN definition No need for a bespoke #define. --- sys/dev/aq/aq_common.h | 2 -- sys/dev/aq/aq_fw1x.c | 2 +- sys/dev/aq/aq_fw2x.c | 2 +- sys/dev/aq/aq_hw.h | 3 ++- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/dev/aq/aq_common.h b/sys/dev/aq/aq_common.h index 17dcc5f23fb1..5f52ce915bc5 100644 --- a/sys/dev/aq/aq_common.h +++ b/sys/dev/aq/aq_common.h @@ -37,8 +37,6 @@ #include -#define ETH_MAC_LEN 6 - #define s8 __int8_t #define u8 __uint8_t #define u16 __uint16_t diff --git a/sys/dev/aq/aq_fw1x.c b/sys/dev/aq/aq_fw1x.c index 02b3f649201c..2aec2cc6f0a5 100644 --- a/sys/dev/aq/aq_fw1x.c +++ b/sys/dev/aq/aq_fw1x.c @@ -272,7 +272,7 @@ int fw1x_get_mac_addr(struct aq_hw* hw, u8* mac) mac_addr[0] = bswap32(mac_addr[0]); mac_addr[1] = bswap32(mac_addr[1]); - memcpy(mac, (u8*)mac_addr, ETH_MAC_LEN); + memcpy(mac, (u8*)mac_addr, ETHER_ADDR_LEN); trace(dbg_init, "fw1x> eFUSE MAC addr -> %02x-%02x-%02x-%02x-%02x-%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); diff --git a/sys/dev/aq/aq_fw2x.c b/sys/dev/aq/aq_fw2x.c index b532977b748f..19de3b7a2746 100644 --- a/sys/dev/aq/aq_fw2x.c +++ b/sys/dev/aq/aq_fw2x.c @@ -372,7 +372,7 @@ int fw2x_get_mac_addr(struct aq_hw* hw, u8* mac) mac_addr[0] = bswap32(mac_addr[0]); mac_addr[1] = bswap32(mac_addr[1]); - memcpy(mac, (u8*)mac_addr, ETH_MAC_LEN); + memcpy(mac, (u8*)mac_addr, ETHER_ADDR_LEN); AQ_DBG_EXIT(EOK); return (EOK); diff --git a/sys/dev/aq/aq_hw.h b/sys/dev/aq/aq_hw.h index 97744de118b8..86689fce832e 100644 --- a/sys/dev/aq/aq_hw.h +++ b/sys/dev/aq/aq_hw.h @@ -39,6 +39,7 @@ #include #include #include +#include #include "aq_common.h" #define AQ_WRITE_REG(hw, reg, value) writel(((hw)->hw_addr + (reg)), htole32(value)) @@ -138,7 +139,7 @@ struct aq_hw { u8 *hw_addr; u32 regs_size; - u8 mac_addr[ETH_MAC_LEN]; + u8 mac_addr[ETHER_ADDR_LEN]; enum aq_hw_irq_type irq_type;