From nobody Thu May 23 20:41:47 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 4Vlg7v6ZXbz5LHlC; Thu, 23 May 2024 20:41:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vlg7v3yZfz43nR; Thu, 23 May 2024 20:41:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716496907; 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=e7t0wz/58KqyhnmryxkADnvavol7nEEjeQWZ+XydqV4=; b=xUZw0QluVkG7FEZsZP5TQKXtdWJQVC+sgv8wPsfxzT7+riuzzPJ+as/h6T9vihSnPjSbat oO+dDJbxszhLRiRcvy/WfRvTDtfiraXv0ft+49xeBHbidxmW/nR9GVOWpg95X89IubGnxW tl3SfZlo6NR5EKaJ0C1KrQuBSGpuolzmxZHvbeXaARbAe3oX4cSlMETq1oAv0JqQkoPStD fzgh4HVp1ltLqPGZsI7kEFi+fLe+il2jisvi0PvyeFSe1iH0npn1I1PAzhSmGm2MXnugyp tn28X23aZEa0TanT4kw5ss57jKBgpjFa7T033sN0y6oSPrmh/zQrgEuuK931kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716496907; a=rsa-sha256; cv=none; b=kKSAaZ3wGwwBS4NWkfcWTFNxC13AkKdSrhfxxerh8K9vzE9aVF+gA/nBNxsEF9dOQGSpUA dm8oecJxDwTy+jk1/NCY8HBJzK0msQPK9QliIaENayAwZ9dWeVZeRLbjp4NFW6Iykmo8q5 s6wcZcKdIYHSrzSOcZ75i3c6ExlLFvNrLt3Ikiv1inyaNhNTzvbe4x7dF7wW57A9HKZKcY k9KOzr5av8pcsjlXEtPaXmU7WV7NEQg2P7i5ECwAJ7ZChXCtKe9dRFMCZfHzFKDiqKpi9z 8Qu20As9OCjq4Hptoz+kYb0o3ZByCu76VKWmtz9eXJ7GHqvtNcnxR5IMf1k8FA== 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=1716496907; 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=e7t0wz/58KqyhnmryxkADnvavol7nEEjeQWZ+XydqV4=; b=s4UlBs9KFXREBlmNgM9Q/7jLbQPzZ843GPtCFiFYNwYtGorNaAza1QtvVC3fAJLUfBsTJk apE3i72H0ZfCCFPm/lBVkn84G5hyvDXxCv28n1GdQbzFJaSL8s7eNTNfX0CNfK+IPOmCtK mFvfiAUwtFJdNOd4DagJqGU4PXV+njUSD+4B/GUFkJgNntQ5QDsCYcEo8231FR35HOJgMg wXS9DiEmMGIM2818ei+alWMylPNhM0Y1u7ixA27+SWq7PGlhaIY7rSOio6zEmjTb70qS+Z 28BRoh1bwgE8KtBMXM0QQF6FpsFzoMpuw2cBLNEhfHIcefvKURY2iqz30EuTeQ== 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 4Vlg7v3Z1Gz14GZ; Thu, 23 May 2024 20:41:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44NKflPe087322; Thu, 23 May 2024 20:41:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44NKflSc087319; Thu, 23 May 2024 20:41:47 GMT (envelope-from git) Date: Thu, 23 May 2024 20:41:47 GMT Message-Id: <202405232041.44NKflSc087319@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4b75afe885d4 - main - sys/netinet/icmp6.h: use C99 uintX_t constants for new PREF64 struct 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b75afe885d4510ee2bd83be21ac78ca9a2f02cd Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4b75afe885d4510ee2bd83be21ac78ca9a2f02cd commit 4b75afe885d4510ee2bd83be21ac78ca9a2f02cd Author: Lexi Winter AuthorDate: 2024-05-14 23:45:47 +0000 Commit: Warner Losh CommitDate: 2024-05-23 20:40:48 +0000 sys/netinet/icmp6.h: use C99 uintX_t constants for new PREF64 struct Reviewed by: imp, glebius (prior suggetions done) Pull Request: https://github.com/freebsd/freebsd-src/pull/1206 --- sys/netinet/icmp6.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h index 05f4737e8fd9..0bccba3754b0 100644 --- a/sys/netinet/icmp6.h +++ b/sys/netinet/icmp6.h @@ -63,6 +63,8 @@ #ifndef _NETINET_ICMP6_H_ #define _NETINET_ICMP6_H_ +#include + #define ICMPV6_PLD_MAXLEN 1232 /* IPV6_MMTU - sizeof(struct ip6_hdr) - sizeof(struct icmp6_hdr) */ @@ -375,10 +377,10 @@ struct nd_opt_dnssl { /* DNSSL option (RFC 6106) */ } __packed; struct nd_opt_pref64 { /* PREF64 option (RFC 8781) */ - u_int8_t nd_opt_pref64_type; - u_int8_t nd_opt_pref64_len; + uint8_t nd_opt_pref64_type; + uint8_t nd_opt_pref64_len; /* bits 0-12 are the SL, bits 13-15 are the PLC */ - u_int16_t nd_opt_pref64_sl_plc; + uint16_t nd_opt_pref64_sl_plc; char nd_opt_prefix[12]; } __packed;