From nobody Tue May 06 11:10:40 2025 X-Original-To: dev-commits-src-main@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 4ZsG0K1n83z5tdly; Tue, 06 May 2025 11:10:41 +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 4ZsG0K0nbDz3qC1; Tue, 06 May 2025 11:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746529841; 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=SUXyEmfXeq7KxYx67bKI/VAIBX7o0UrO/9XiTZlbNKQ=; b=N3j1iMz7Kdr9eAV7QE8der6zYmluYxVwFPghYYr2ly6e7mWoSh/Zv9EJjEaONVUfFFG5LP cHgWhF9YBgZXCAcJuRvhP3KUD89y/C06NZcbQ9QmdceafSEdw4XQOKjhoiqJgj9XD4dPwt evN3CaAQnTScH1WOJZ4ou3HRXXLZrhNzunQrOBxMfr9VP44X6BD56O/v5ThdHxF79ickPp 4CFTjQxSNPCNoxPizjHiLuKc0UdjMhLXHV/CbXZaP6nw8eb/G7jEM1ps7sTyumHTlqa/aZ UadDL2885iAk4SaBqNUGO1wSO0s3Rk10Vr3Stqy/vFwxOevb0LbXDcBeGY5bFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746529841; 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=SUXyEmfXeq7KxYx67bKI/VAIBX7o0UrO/9XiTZlbNKQ=; b=yLhadhL1TI/3CfRWDg1GWuA99uvmY/cMvGBYW6VVn1bEF3XNN6xRK4mhPOmlPutfa43lOn HeCpGA8qPglytjRW4PaJHOz8x9ZX45O9fzXmYfV9Olh+uoBM064K+9jyW91wCrwUllT0bU QmfFIvdCo9iP+WHrHZKwZty/4oaxZ0NQrGx0gsiMBZDsCjFAbDI0Dv6HL/ab/BFmz97W1V fLecz0vBpGwz4QWcYAWc2jH3kUziUREpYrJzhXEWds0ktp5Mvyi53GNLAuhMpNPF6z5EqE hQpilem3MLZ6dx5paHCyAL392jQG39UEWs498Mg74aI0KImYyPnYWdvI9QV/uQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746529841; a=rsa-sha256; cv=none; b=GvPCM57cpUuGjvwkE1oOMIP6IcdhBP1dnBc29K0i4GZwgWo5waG7ENuLEoUacDII2K6YWg 9GEhpApDR/4NLwbRlOZBerPUJbGg89c40Ze5nyHqRdp+2JDW0LJlXQ9ru8rz/wCHQtqfwT +dbbllvPCrdTQJTSTS+tTrJ9Kvcl5obcghI+bF/IUkwP7TqBfYecJj25xkbFuVbCR0VP3f L7hlJZbENxFz0roZF6vzDKA0VkgjcVM1S8otYhZL+VKs9oFUI4vGKmZ7nrIVrjw99jnOrt xf7rKQqcBXJFjR1EOtZaupaG1g4siuI3tdEKcoTPE/jvnEOAIfWm07YqDGKEcQ== 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 4ZsG0K0NRJzxdQ; Tue, 06 May 2025 11:10:41 +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 546BAeaZ003655; Tue, 6 May 2025 11:10:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546BAe2Z003652; Tue, 6 May 2025 11:10:40 GMT (envelope-from git) Date: Tue, 6 May 2025 11:10:40 GMT Message-Id: <202505061110.546BAe2Z003652@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 70b5c918571b - main - net/if_dl.h: make self-contained List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 70b5c918571b6c79459ee6de66ceb4c83974d542 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=70b5c918571b6c79459ee6de66ceb4c83974d542 commit 70b5c918571b6c79459ee6de66ceb4c83974d542 Author: Lexi Winter AuthorDate: 2025-05-06 10:20:44 +0000 Commit: Lexi Winter CommitDate: 2025-05-06 10: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 --- sys/net/if_dl.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index e57cdade9e59..f8c7c2f75956 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -32,6 +32,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 @@ -65,7 +67,7 @@ struct sockaddr_dl { contains both if name and ll address */ }; -#define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen)) +#define LLADDR(s) (&(s)->sdl_data[(s)->sdl_nlen]) #define LLINDEX(s) ((s)->sdl_index) #ifdef _KERNEL