From nobody Tue Nov 17 20:01:38 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 4jTbGV2nHgz71mBx for ; Tue, 17 Nov 2026 20:01:38 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTbGV1qvrz3LVH for ; Tue, 17 Nov 2026 20:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794945698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tu+eFld0QWQSUoqNBxEY6s8GeLgdLgXuHLtFgi5yBho=; b=T0wt25FCnZ1/6mtZ1rC45qLv5kL62HAYBrLqcJW9+hubUuMq4eqtEHxbPdloVkBWw5KTRE frF8/WYcGsPpYQ9brIOqzyD/kbCWt8c2PVod006HxdT4w6Xs5FZ+mQz+ZG3blbXepZjjWM 5VsynxgJzdyxvhgPh92uZ+ETgiMeBLdzSkvdZP7HooTZZVhx6w+5Y7yQpsyr3s0SUVU7/A DRxaOalQAuDyb+anqqXl4MJdMryJUK4beIlI3auV49icRw/BTzo+QZ5VQSVxv/Cg5PsAJ8 N1zsNKP3r+6M1VTEh0W3i0+OT8T+8qSnwiGkdJr6UVAJu021veGkClzJeZEsxA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794945698; b=E3SSh5pE93raxugfY52esTT1Q1cj6Tk9CaUvMhxjKo8E4Bvcvi5mZHVKDJM0VeVbWNFpux zk7ZLGVdsRkTla86AN7XrNC3QetAgziBlR6K2iY67RrtPrAoins+yCnM43+NyLymkKXKmm xVvPQC+G5ddVWGM/1zH4rs+wP7cEzXle49BSzpVoGrmLbRR9NgwceL94BqELofK95jX1WH B/4XyfJseqbeGnxZrhESZgIjIXVy83TOgrhEiQgMilTCbg764+qy765Q9edz9TOFVINGRy RPyjXgHtsSEL9E3yrZkCJtqdCpL3vJPhSgmtEw+th+evBkGwTOEPNPr03dEUYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794945698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tu+eFld0QWQSUoqNBxEY6s8GeLgdLgXuHLtFgi5yBho=; b=YOlcUBabbk7/Zf3RsYmOpuVslT4dbZNg60trSFko/IUkWVtvbUJW7iCFtvdwUOiKN4L1mM d+3jupOVSIJ5fJQcIOHbK1Vo0S9y29saR3p9TtU/zWbuXcTwdEufez1LPNkkiCxJ05Gt1h tATKFOwJx1PscpnKMPIvi273jovLahpMk1DRfdrMYl5DqeTWbV3S3U7ofMKLcGhCHmotpa uE7OXUUqBbWvEYeAHrm3GSMKlYUibkBU51fk11ymGY5syRuoWzI0ksTFAps+WrnGWi4OZ6 sVqY2pllJTWMhXl592Qgm71giYNY2DtXO64u/xkSIuDA5u0P7RS+PccIfrmIwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTbGV1TgfzxVf for ; Tue, 17 Nov 2026 20:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 12e6d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 20:01:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Osvaldo Janeri Filho From: Kevin Bowling Subject: git: b496e15118bc - stable/15 - axgbe: return positive errno values from the sysctl handlers List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b496e15118bc90693cff7525d566c6b2610a7d87 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 20:01:38 +0000 Message-Id: <6afcb2a2.12e6d.52cd049c@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b496e15118bc90693cff7525d566c6b2610a7d87 commit b496e15118bc90693cff7525d566c6b2610a7d87 Author: Osvaldo Janeri Filho AuthorDate: 2026-11-10 19:15:02 +0000 Commit: Kevin Bowling CommitDate: 2026-11-17 20:01:24 +0000 axgbe: return positive errno values from the sysctl handlers Return positive errno values from the FreeBSD sysctl handlers so that userland reports the proper error instead of "Unknown error: -22". Convert the negative phy_config_aneg() result at the sysctl boundary, matching axgbe_if_media_change(), and retain the PHY code's internal error convention. Differential Revision: https://reviews.freebsd.org/D61400 (cherry picked from commit c89613ded9237811d35a42788e9728fe0404e26b) --- sys/dev/axgbe/xgbe-sysctl.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sys/dev/axgbe/xgbe-sysctl.c b/sys/dev/axgbe/xgbe-sysctl.c index a539a6942ff5..025d8c5858cd 100644 --- a/sys/dev/axgbe/xgbe-sysctl.c +++ b/sys/dev/axgbe/xgbe-sysctl.c @@ -241,7 +241,7 @@ exit_bad_op(void) { printf("SYSCTL: bad command line option (s)\n"); - return(-EINVAL); + return (EINVAL); } static inline int @@ -252,7 +252,7 @@ get_ubuf(struct sysctl_req *req, char *ubuf) printf("%s: len:0x%li idx:0x%li\n", __func__, req->newlen, req->newidx); if (req->newlen >= SYSCTL_BUF_LEN) - return (-EINVAL); + return (EINVAL); rc = SYSCTL_IN(req, ubuf, req->newlen); if (rc) @@ -297,7 +297,7 @@ get_val(char *buf, char **op, char **val, int *n_op) op[*n_op][j] = buf[i++]; } if (i < blen && buf[i] != ' ') - return (-EINVAL); + return (EINVAL); op[*n_op][j] = '\0'; if (i >= strlen(buf)) goto out; @@ -310,7 +310,7 @@ get_val(char *buf, char **op, char **val, int *n_op) val[*n_op][j] = buf[i++]; } if (i < blen && buf[i] != ' ') - return (-EINVAL); + return (EINVAL); val[*n_op][j] = '\0'; if (i >= strlen(buf)) goto out; @@ -318,7 +318,7 @@ get_val(char *buf, char **op, char **val, int *n_op) *n_op = count; } if (i < blen) - return (-EINVAL); + return (EINVAL); out: *n_op = count; @@ -567,7 +567,7 @@ sysctl_get_drv_info_handler(SYSCTL_HANDLER_ARGS) return (rc); } - return (-EINVAL); + return (EINVAL); } static int @@ -591,7 +591,7 @@ sysctl_get_link_info_handler(SYSCTL_HANDLER_ARGS) return (0); } - return (-EINVAL); + return (EINVAL); } #define COALESCE_SYSCTL_INFO(__coalop) \ @@ -721,12 +721,12 @@ sysctl_coalesce_handler(SYSCTL_HANDLER_ARGS) if (rx_riwt > XGMAC_MAX_DMA_RIWT) { axgbe_printf(2, "rx-usec is limited to %d usecs\n", hw_if->riwt_to_usec(pdata, XGMAC_MAX_DMA_RIWT)); - return (-EINVAL); + return (EINVAL); } if (rx_frames > pdata->rx_desc_count) { axgbe_printf(2, "rx-frames is limited to %d frames\n", pdata->rx_desc_count); - return (-EINVAL); + return (EINVAL); } tx_frames = sys_op->tx_max_coalesced_frames; @@ -735,7 +735,7 @@ sysctl_coalesce_handler(SYSCTL_HANDLER_ARGS) if (tx_frames > pdata->tx_desc_count) { axgbe_printf(2, "tx-frames is limited to %d frames\n", pdata->tx_desc_count); - return (-EINVAL); + return (EINVAL); } pdata->rx_riwt = rx_riwt; @@ -820,7 +820,7 @@ sysctl_pauseparam_handler(SYSCTL_HANDLER_ARGS) if (sys_op->autoneg && (pdata->phy.autoneg != AUTONEG_ENABLE)) { axgbe_error("autoneg disabled, pause autoneg not available\n"); - return (-EINVAL); + return (EINVAL); } pdata->phy.pause_autoneg = sys_op->autoneg; @@ -844,7 +844,7 @@ sysctl_pauseparam_handler(SYSCTL_HANDLER_ARGS) } if (test_bit(XGBE_LINK_INIT, &pdata->dev_state)) - rc = pdata->phy_if.phy_config_aneg(pdata); + rc = -pdata->phy_if.phy_config_aneg(pdata); } @@ -946,19 +946,19 @@ sysctl_link_ksettings_handler(SYSCTL_HANDLER_ARGS) (sys_op->autoneg != AUTONEG_DISABLE)) { axgbe_error("unsupported autoneg %hhu\n", (unsigned char)sys_op->autoneg); - return (-EINVAL); + return (EINVAL); } if (sys_op->autoneg == AUTONEG_DISABLE) { if (!pdata->phy_if.phy_valid_speed(pdata, speed)) { axgbe_error("unsupported speed %u\n", speed); - return (-EINVAL); + return (EINVAL); } if (sys_op->duplex != DUPLEX_FULL) { axgbe_error("unsupported duplex %hhu\n", (unsigned char)sys_op->duplex); - return (-EINVAL); + return (EINVAL); } } @@ -972,7 +972,7 @@ sysctl_link_ksettings_handler(SYSCTL_HANDLER_ARGS) XGBE_CLR_ADV(&pdata->phy, Autoneg); if (test_bit(XGBE_LINK_INIT, &pdata->dev_state)) - rc = pdata->phy_if.phy_config_aneg(pdata); + rc = -pdata->phy_if.phy_config_aneg(pdata); } return (rc); @@ -1042,21 +1042,21 @@ sysctl_ringparam_handler(SYSCTL_HANDLER_ARGS) if (sys_op->rx_mini_pending || sys_op->rx_jumbo_pending) { axgbe_error("unsupported ring parameter\n"); - return (-EINVAL); + return (EINVAL); } if ((sys_op->rx_pending < XGBE_RX_DESC_CNT_MIN) || (sys_op->rx_pending > XGBE_RX_DESC_CNT_MAX)) { axgbe_error("rx ring param must be between %u and %u\n", XGBE_RX_DESC_CNT_MIN, XGBE_RX_DESC_CNT_MAX); - return (-EINVAL); + return (EINVAL); } if ((sys_op->tx_pending < XGBE_TX_DESC_CNT_MIN) || (sys_op->tx_pending > XGBE_TX_DESC_CNT_MAX)) { axgbe_error("tx ring param must be between %u and %u\n", XGBE_TX_DESC_CNT_MIN, XGBE_TX_DESC_CNT_MAX); - return (-EINVAL); + return (EINVAL); } rx = rounddown_pow_of_two(sys_op->rx_pending); @@ -1213,7 +1213,7 @@ sysctl_mac_stats_handler(SYSCTL_HANDLER_ARGS) return (rc); } - return (-EINVAL); + return (EINVAL); } static int