From nobody Fri Jul 24 16:01:24 2026 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 4h6CQr3Vglz6mLVr for ; Fri, 24 Jul 2026 16:01:24 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6CQr1vQpz3b7d for ; Fri, 24 Jul 2026 16:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784908884; 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=JS3mwFrKBVj1I9YbJF6di+HFtx49XQ0k0KXl+PtMcx0=; b=ZhpU4xDLA/LY5csxMDQwJfQk1pRGRsZNN+enK1pF4V2kojbxLyDujeDOySQZziAWlzYyMa v9TLXJkeGsjdsB7wYIgRKgs+c40EoBU4e7M9RFAJOTmDP3j4umvGtRH4E8PGxOL6sJMFvl kpGU9Ca0AmT45fbNzmc+r0lfB5/mdEzPkwrKuPonZpnsPrJc43kcvb8vQ5aQGNuQH34vMf IwTCYKh13oXEHaGYYOTWls3sVnDbmd52rp/4eDPjoIPcp/KyWZn0z/bpVYCE/lm/7Fd22b KuiKgxA/4F9Nef+dnf32NkPBuQi6qgX2dWItEA+fV7msIzuyRnOWqlSrUtODIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784908884; a=rsa-sha256; cv=none; b=cX17jPtSXPRHXGxUepFD0IQZQh7qCfhRy2UnoMq68XhqyjNhXSYrSDDuy2HPwg1+/v1Fxf EeDwUbjYsW+quOi8vDIK2mwPvxH2k7pDdDNqL388l2TBIk4YgOlcUcJuEbk4jngjTzNLnP 1qentSkryVEzlnHuFCISnCTV5OKAsBRskguQWCaPyHqgQecdRLXwZZv45BFMzGRZE+Uy7W IfkbdYKelKS4yMmc0HPVeX61NcZA6I2XZfTnWccP3vwQ/ls2Bum5Y5H2ilfzVFl+SxKcwa /w96/uxTb7XyzeySM4bK6msXjPrv9sE8V70u9d4L2C77ncqou2yYOwtHUg9p1g== 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=1784908884; 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=JS3mwFrKBVj1I9YbJF6di+HFtx49XQ0k0KXl+PtMcx0=; b=fYnajCn5evc32mYBng139+jrorKq+5hnyvpyWLhayE5KG2xEiWcfPXmbfxR5TuXGaXc42b L2/UEfn9s3Qp/le4H2SE7zczWpKndSmI8a6e3A+gKphv9CBCHUgnU0P8bZOUDt22bskMsf dKzGWFxBVnQNW1I1uzjaewPiUL4Bp8zEBbGP9uZgbl2ymLNzSdL/+jMNtL/jfe5gAyBU+v aiRxJwebPxl5VzzkprkNMKEBZvTEHHuVdzd9Wit5eMl/ATKNAoEtyZghU9bXHfDraRYk7l mV2WPzOPJWPQwikWjzpxHgl/z1P433y21IQYD/oZYypVxzpMf5lyQrywmZscAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6CQr0f36zxxC for ; Fri, 24 Jul 2026 16:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a572 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Jul 2026 16:01:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b22b15981dbe - stable/15 - 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: b22b15981dbed61cac32cc5325fb073019e8aa69 Auto-Submitted: auto-generated Date: Fri, 24 Jul 2026 16:01:24 +0000 Message-Id: <6a638c54.3a572.38102d3@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b22b15981dbed61cac32cc5325fb073019e8aa69 commit b22b15981dbed61cac32cc5325fb073019e8aa69 Author: Ed Maste AuthorDate: 2025-11-13 22:20:13 +0000 Commit: Ed Maste CommitDate: 2026-07-24 16:00:19 +0000 aq(4): Use standard ETHER_ADDR_LEN definition No need for a bespoke #define. (cherry picked from commit 8c64625d90792462289686e0209a9f3fff67fc9b) --- 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;