From nobody Wed May 7 21:07:49 2025 X-Original-To: dev-commits-src-branches@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 4Zt7Bt1qHwz5vHnD; Wed, 07 May 2025 21:07:50 +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 4Zt7Bs3fj9z3JyQ; Wed, 07 May 2025 21:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746652069; 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=zZM04kX7qkqg3tsqyCUFwBuIwkv6OJWjqdjLgGPtycI=; b=k+EXHclQJ1xvHYOL8+h6RQSJeHkHu5XIyo49KoqGAcDFlAGouRi37h8oWLu/jfAwQOpBgX mdYQdmM8wjh/TvshMg2/M+MoHg2Sci2GzeCWpHwSiChXQ+CgrjdGjTUIxFUiNpZCJsxfmG le+MHFDAu/QM4YiATLdjW+d76Q/CzIEKBRclkBcJYlZZi8PUtOgEGPIrpqBDNsFOBoXcPW FtvA+1+RrjB5gJXqiiVbJVXD/ccQoVJeOW8MsDdx6t8Z1r5H/ALGDmpQNZAru36RpSntEJ Yy6IBV/C+j/JX0CTeTaRJzBMc5WyEcBk5QlYqSGrFxojSgoao7dUAw/+AMCCJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746652069; 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=zZM04kX7qkqg3tsqyCUFwBuIwkv6OJWjqdjLgGPtycI=; b=oL0TMv/xyAcBTbx+odFASf1oUB8cFGYREtoLdjBZX+1lBNl3EPyJ4cRe5LBe+bs3LHwKR3 M1eQooAL5Eqkt1EuH309pGE0v5cUAyNoLaOzCxVUHENFzYwhTUz2CHdxsmxa6mWk8MLvdY hFN/u+CnegWe5KYWRdYg10TB2xtv5s9BdnKciIa9Ek9xeb6cMhsZOzaMqlYRkMNuZf5Lng Y1UwV3seoI2Iv5a5EybB/FzwOYJ3/B2zZezvhTsvMocfEjTh8WM4FivxRhGTkOkRB+MTnv zQb9wjvk5CI2wdO7iYfTHD0mfqF7MmhRbdIStnb0HpqdzGVqPuTRjUUp7N0izA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746652069; a=rsa-sha256; cv=none; b=U9wh8RHHHC6GhbHqtXuwg1sXO+oqWhc4bg7mTjcCMQg3+aZtvdN0ZcuAVTl6J6/cuJboQ5 Q41coCvEOZbnbi+ivymtcJ6u0H3O96uv+qBuZJqg2i8DjrGDMBOfn5jCBhkABUaWxHckM8 9BUZ+B9F5jCaSZE8bCvBai/7T8Th+jJRlSKg20RF2cK4qjK3oIef7rihxmd1xi1DsbCoon 3i+Fqnjc8ekSElleW9TaquErHdRLJ4sIUuhjqh4RZ6RYwe0oUEFlJD4EcxODSWzOZARcse UaGJ3eiz3byCxIQuFBljmmD3xr+CRV5B6Im7d8RBQrGZ06puIxeOqVXwbZDOTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zt7Bs3BmDzmK5; Wed, 07 May 2025 21:07:49 +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 547L7nQN036028; Wed, 7 May 2025 21:07:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547L7nPP036025; Wed, 7 May 2025 21:07:49 GMT (envelope-from git) Date: Wed, 7 May 2025 21:07:49 GMT Message-Id: <202505072107.547L7nPP036025@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 4b0b2b5650ed - stable/14 - net/if_dl.h: make self-contained List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4b0b2b5650ed2edeac00d3c6d1e1b402914ff032 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=4b0b2b5650ed2edeac00d3c6d1e1b402914ff032 commit 4b0b2b5650ed2edeac00d3c6d1e1b402914ff032 Author: Lexi Winter AuthorDate: 2025-05-06 10:20:44 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 19:20:44 +0000 net/if_dl.h: make self-contained include for u_char and u_short. to avoid including , remove the caddr_t cast from LLADDR. we are trying to get rid of caddr_t anyway, and since sdl_data is already an array of char, the cast is unnecessary. this also makes LLADDR const-correct, i.e. passing a const sockaddr_dl will return a const pointer. Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50065 (cherry picked from commit 70b5c918571b6c79459ee6de66ceb4c83974d542) --- sys/net/if_dl.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index 035a3346dc08..31579efdeda4 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -34,6 +34,8 @@ #ifndef _NET_IF_DL_H_ #define _NET_IF_DL_H_ +#include + /* * A Link-Level Sockaddr may specify the interface in one of two * ways: either by means of a system-provided index number (computed @@ -67,8 +69,8 @@ struct sockaddr_dl { contains both if name and ll address */ }; -#define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen)) -#define CLLADDR(s) ((c_caddr_t)((s)->sdl_data + (s)->sdl_nlen)) +#define LLADDR(s) (&(s)->sdl_data[(s)->sdl_nlen]) +#define CLLADDR(s) ((const char *)LLADDR(s)) #define LLINDEX(s) ((s)->sdl_index) #ifdef _KERNEL