From nobody Wed Apr 22 21:08:54 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 4g1BfZ5NBZz6bLBG for ; Wed, 22 Apr 2026 21:08:54 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g1BfZ2cS2z3lhs for ; Wed, 22 Apr 2026 21:08:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776892134; 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=ZKg2m9dU7Ad5vJBocku9oadfjU/HAowBfBamwDdHFVs=; b=sjHu08VYaS5wQfMxDivqQovVTpmimgQUrb7FTaymz1Eb1H/AWlsQnWo7+uPwEAc47uiDAd +6ailjHbi6a3uIUnBLMIllYN2nVP+wiZtw9+PA8CLuIsMdFbtxAKQNHv9juIsld9hsjphT 6ACSDOb+P49LLNs4ewFas8hOsUK2iY1xLH72pIJ4ej29JI4Aq38zIkr04ARqkEmjHqL4NQ 7ZAgnNmoFjcdfWgwUAdUcEFT8+Mw1kndyU5S8Tb1n3MiXpL0qaBzuLPC70cRORKQT9xgst LXxkCHV2LBjR3dy2n5Q8BDc+GKFnEXKW4W9P52B/1+E7/JngliDbtglIUuQaPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776892134; a=rsa-sha256; cv=none; b=OxYpJX/3wH+5pzYFfJXWpth/19EgTB4QBWtzeNy/gc0zeviRYj8sKAO+4X26Tu3XUF8AQb m2dxuXKzTtDOOdo0Sl6zY6MEid7OKPU5hkLuFr9/YzRohGYhQR3zX30N43vl7kUX5gej6b sF2u/imM5jzI4sT+OG1eqBRUjOEsL6GLO7TGWQ18M5axK6PhFvEggedmqi99c8WcNHmvul 3WT3KTzaTqxqvIieKR58mY1OZqo3ZWz/WMGIv6uTHiNbPCDFIh7PF+GRbIWCQNkRU43nZu 8slpju+KnB0hBIfabLwNP+BdWgqJpQIDKS20CxtNprqYZ/fJ9JSE1/tT8KwQMQ== 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=1776892134; 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=ZKg2m9dU7Ad5vJBocku9oadfjU/HAowBfBamwDdHFVs=; b=ds98BGxvQ55gz4RBDicPOOhU2jr7a75bjoUGkTfIwy+KdqIggtFxdipPFHISxlp77BWi7S 2V/zPyOisXHTIWnpwsXh5WYMoiKruEcELIInamGS302KwikMmFFhq9eqq1vOnC+xc3ZwkB M2Kjsi3q3uo472bEPrVD+2eshNqHCflbTaQKS7JIfz6nCbEl5ovJWsx1gqRJFS/b3gYGTj F/ivVx/v/7LW4LDmFQJX9jSY4JneND9zWd7HkSzgPTrB5YfBVN3N7M26WTk8XcZQqwCu30 UC0NNpHmM/h7Oc1lRbLSdfm5UeOhr30pjt+zerNOdwrUfjZmoSuKjybTFRmIbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1BfZ1yYvznjb for ; Wed, 22 Apr 2026 21:08:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30a21 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 21:08:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 97c58ec8702f - stable/15 - LinuxKPI: move hex2bin() from kernel.h to new hex.h 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 97c58ec8702ff1275f77e8d5ffb519da0d386268 Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 21:08:54 +0000 Message-Id: <69e938e6.30a21.7c175af3@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=97c58ec8702ff1275f77e8d5ffb519da0d386268 commit 97c58ec8702ff1275f77e8d5ffb519da0d386268 Author: Bjoern A. Zeeb AuthorDate: 2026-04-14 13:36:40 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-22 20:57:08 +0000 LinuxKPI: move hex2bin() from kernel.h to new hex.h New Linux v7.0 drivers include hex.h. Rather than adding a dummy header, migrate the kernel.h hex2bin() into hex.h, where it belongs. Care needs to be taken as the _h2b() helper function is still used by other bits in kernel.h. Sponsored by: The FreeBSD Foundation Reviewed by: emaste, dumbbell Differential Revision: https://reviews.freebsd.org/D56391 (cherry picked from commit 98297ff3cfbb42df86fa7af51a2740d5aa7236eb) --- sys/compat/linuxkpi/common/include/linux/hex.h | 44 +++++++++++++++++++++++ sys/compat/linuxkpi/common/include/linux/kernel.h | 32 +---------------- 2 files changed, 45 insertions(+), 31 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/hex.h b/sys/compat/linuxkpi/common/include/linux/hex.h new file mode 100644 index 000000000000..7e9f499cfb1b --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/hex.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2022-2026 Bjoern A. Zeeb + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef _LINUXKPI_LINUX_HEX_H_ +#define _LINUXKPI_LINUX_HEX_H_ + +#include +#include + +static inline int +_h2b(const char c) +{ + + if (c >= '0' && c <= '9') + return (c - '0'); + if (c >= 'a' && c <= 'f') + return (10 + c - 'a'); + if (c >= 'A' && c <= 'F') + return (10 + c - 'A'); + return (-EINVAL); +} + +static inline int +hex2bin(uint8_t *bindst, const char *hexsrc, size_t binlen) +{ + int hi4, lo4; + + while (binlen > 0) { + hi4 = _h2b(*hexsrc++); + lo4 = _h2b(*hexsrc++); + if (hi4 < 0 || lo4 < 0) + return (-EINVAL); + + *bindst++ = (hi4 << 4) | lo4; + binlen--; + } + + return (0); +} + +#endif /* _LINUXKPI_LINUX_HEX_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index 880d2f67c517..2430b25c6915 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -56,6 +56,7 @@ #include #include #include +#include #include #include @@ -305,37 +306,6 @@ linux_ratelimited(linux_ratelimit_t *rl) #define add_taint(x,y) do { \ } while (0) -static inline int -_h2b(const char c) -{ - - if (c >= '0' && c <= '9') - return (c - '0'); - if (c >= 'a' && c <= 'f') - return (10 + c - 'a'); - if (c >= 'A' && c <= 'F') - return (10 + c - 'A'); - return (-EINVAL); -} - -static inline int -hex2bin(uint8_t *bindst, const char *hexsrc, size_t binlen) -{ - int hi4, lo4; - - while (binlen > 0) { - hi4 = _h2b(*hexsrc++); - lo4 = _h2b(*hexsrc++); - if (hi4 < 0 || lo4 < 0) - return (-EINVAL); - - *bindst++ = (hi4 << 4) | lo4; - binlen--; - } - - return (0); -} - static inline bool mac_pton(const char *macin, uint8_t *macout) {