From nobody Sat Sep 27 15:14:11 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 4cYrZr4NwRz68DCL; Sat, 27 Sep 2025 15:14:12 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cYrZq6YYPz44T6; Sat, 27 Sep 2025 15:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986051; 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=kZf7O9+VTxLQ1cZRCzXXZV+7Z1L5Za58W1rmWEfA4Ws=; b=aRLH1m2ZrzdnPcni1GjRm5ohpczPd7+yOotIrGdqRGYsVqDZN/0dlaxmhLS+lvr5dxA1/h 1QhONbxOmIROTLp/XW5g28yimqbFfj8r+gnbnrLRDeX1IBkqtO8JvRFvMvfPwUr9q4AzQ2 fhFWvcgjrcoJkIxjtyFM3NUzPcO5UNYDC1A0NN6iZ8FFN2Rmr3rCX1PTMc9I/GrF4GV/um 6N4c+5dzTC5tfnY5vH9KbKj3vh/CMtBzeYvmAbJOoYjTahTGDmtNBQzKZV3drxq6H2RqO/ cwiGHJdIhjaOxJt0942Y0P+iJs7ZlYZoNJyk119T6IkA+vS5b2wgevA/hMA+zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986051; 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=kZf7O9+VTxLQ1cZRCzXXZV+7Z1L5Za58W1rmWEfA4Ws=; b=Pe1BgsBNzFiDYDwYhvCWCkMnfKgNVDaVUxDee/Lz13M/muvY9ay7gBgJIMOtx40Xn37OTX CR771/OeeGs5UuOZkI8bGup86B8hI/2hsxF078zupaP8BR27dppdaYJTnpZRm17bp3RQrh zsZj1frbnAFUsDtWXTDG0DzGacMkLFg3Nm+FPj9ZXT9/LTpk65oCFHWERxmEx9uwsgto3H o2iovB1YXd3IU9dE/ejZLae4/68f4c65Or5m2yAB8WEdFDJJgCB3A5AYPHs+FgAwGLc6YT u4eOhPrUcgtJ5mZiRM922vZ2gBpfblRdjPJsMwAOMN/x3X10dbbmBdsjblsR2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758986051; a=rsa-sha256; cv=none; b=cltucgAlO3RJ7DHUKGIWKipOjtSdeYVwSZeQTFxYv9WsgqachUQVX6cVYO6lYbFd2FYppo ZasufJdWak/kl64byCePlrlCEf6PPfdcVYIL0bGKGDSNU5ym718MO5PFAvFhF1IDCdO0dT 6MoAP/SCUNl6cnyNQqgo743UQQEEip/0zbMqpzaOTA0HyuUOY8KxWPkb67DIBXMxmWDsRO m09ai+ZoovEUXMmDNTaBnK5Dl4HxCDoYyxKREgo4lg8w4SdfHhYxVduWN++7yNxg9ctnmo svzct6XeWxTLH8xpME6h5wOHdF192MxKg93zZXsFDb207PDHShySm1H9NjzJBA== 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 4cYrZq66mxzfhB; Sat, 27 Sep 2025 15:14:11 +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 58RFEBIF083574; Sat, 27 Sep 2025 15:14:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58RFEB7i083571; Sat, 27 Sep 2025 15:14:11 GMT (envelope-from git) Date: Sat, 27 Sep 2025 15:14:11 GMT Message-Id: <202509271514.58RFEB7i083571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ac4b48b6ad34 - stable/14 - qlnxe: Support SIOCGIFXMEDIA ioctl 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ac4b48b6ad34a83406054c5badd0f835136ffd88 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ac4b48b6ad34a83406054c5badd0f835136ffd88 commit ac4b48b6ad34a83406054c5badd0f835136ffd88 Author: Zhenlei Huang AuthorDate: 2025-09-09 10:04:54 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-27 15:11:39 +0000 qlnxe: Support SIOCGIFXMEDIA ioctl ifconfig(8) will try SIOCGIFXMEDIA first and then retry SIOCGIFMEDIA if that fails. Since the driver reports extended media types, support SIOCGIFXMEDIA ioctl directly rather than doing another round. Reviewed by: kbowling MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52375 (cherry picked from commit 6e3c8c0f709ab0b9d70e2725e58f4a4ba7a4404e) (cherry picked from commit 817bc700927087a52d0dd34c43e45736a867240e) --- sys/dev/qlnx/qlnxe/qlnx_os.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index eeea1aa17ac9..32b893480401 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2719,7 +2719,9 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) case SIOCSIFMEDIA: case SIOCGIFMEDIA: - QL_DPRINT4(ha, "SIOCSIFMEDIA/SIOCGIFMEDIA (0x%lx)\n", cmd); + case SIOCGIFXMEDIA: + QL_DPRINT4(ha, + "SIOCSIFMEDIA/SIOCGIFMEDIA/SIOCGIFXMEDIA (0x%lx)\n", cmd); ret = ifmedia_ioctl(ifp, ifr, &ha->media, cmd); break;