From nobody Thu Nov 30 00:38:16 2023 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 4Sgck11tzpz52Tyy; Thu, 30 Nov 2023 00:38:17 +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 4Sgck114gSz3MpY; Thu, 30 Nov 2023 00:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304697; 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=rvM/2WarlmhI+TmtHh/76+Ng59HGw5s9bPcZVZySoxg=; b=jmGpmFQCiqJkzhx163P5uAV+5kZ9NQJ/MlF7cz0hUbF11HJuz2T4oa7+gC0zp8hKP2PUrH KKCUWuOo7IqSvq/N5dlpqba/qfckzrKefJEmq3Le7quVBU6sRh/otFfTBXJYslL7YLWY8y Wqq7zRUJo1Bm17oHegJSsRlHdIFZ3X0niNwz0+DM04mNwsqCTFnJ8n1pJfQrNQtaj3jyij slF53MyX+S8mHILrP9x+mjFJVTvJxb0ki7tceysmzDPouCJpX+UZqixudIOo3+9SS9kAIV Uh1vaDSV0XF/+H1rkYOu+ptRcIcmsDq4XIWBhZh730AaIo6JZPubCdVVhtXnSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304697; 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=rvM/2WarlmhI+TmtHh/76+Ng59HGw5s9bPcZVZySoxg=; b=Wn7AGMfmWAz8Q0frREUWdcYfM2AD6DJY3R2CC4UlybrLOJMRD/tWb1+Nl2mllaozO+rlED S9LYwHqq+p3r+oTOF7ZaDafTCVq5KN6441C+xouyeqCpg3KiT88oa63u+7o7cS0n73AL4s CXaGu3XBEeKQ7dNtES1re+31XFp8HPggZQiDIrSNPo/S9/j5vXXxrQ2/eGkp6Nyk0As9iY I9x42EdoNwc9UCmGRUAhrALZBUWg/9lGCBL7PPXls51lLTYitOcWm/LZ7MGb2gAMU8zBaf sA/3IbRVr6kA7ggrhYFd455xWDz9PIakUMZvbJqJesIiRM7zMNAhXA4MYclmSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304697; a=rsa-sha256; cv=none; b=W/uDsloJ8dLClmQvbqASYIa1v+6E5F65rjzy7GzGawu6O0GPN67pBkSjTJHoBpBruH6lYY HRKhqmtqoJOT3Tvhes4Qlua1mzAtjGKitSah8n9TXPyBtYusj2Q2BZhCAmb7sJc4upl0xU R52OVhswRYdSv6nN2lib8TZEzanSm7/aLnRJ7Ufz2G5l2TfDm0oEQAj8ntl+k7N3LE+7wc gG578l64iH3YAlgjQmchAMQL+SwZfmF30N7+t8s7GK2+Ex5QF8Jcs3+LD+BFyQYiD5ZL4B CTfg4xZo9vRzqqXAIb9MocGHiDiCWE1/VyGReL5IMZnofqVtE1jNu1gXLG/4wA== 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 4Sgck10BKtzDCP; Thu, 30 Nov 2023 00:38:17 +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 3AU0cGro051989; Thu, 30 Nov 2023 00:38:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cGCP051986; Thu, 30 Nov 2023 00:38:16 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:16 GMT Message-Id: <202311300038.3AU0cGCP051986@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 1d2f963afd83 - stable/14 - LinuxKPI: 802.11: error on state transition failure 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 1d2f963afd83b5b06b2a0c143e480e613dbc8608 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1d2f963afd83b5b06b2a0c143e480e613dbc8608 commit 1d2f963afd83b5b06b2a0c143e480e613dbc8608 Author: Bjoern A. Zeeb AuthorDate: 2023-10-25 22:29:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:57 +0000 LinuxKPI: 802.11: error on state transition failure The state transition failures we were seeing in the early days are solved. If we now experience one stop processing before passing over to net80211 (sta_newstate()) and before updating iv_state on the vap. Sponsored by: The FreeBSD Foundation Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D42423 (cherry picked from commit 45c27ad5241f5491234afd0b47d13b8005fdb4de) --- sys/compat/linuxkpi/common/src/linux_80211.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index e8fb5b4914a6..3da91fa3e0b7 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2137,12 +2137,11 @@ lkpi_iv_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) } if (error != 0) { - /* XXX-BZ currently expected so ignore. */ ic_printf(vap->iv_ic, "%s: error %d during state transition " "%d (%s) -> %d (%s)\n", __func__, error, ostate, ieee80211_state_name[ostate], nstate, ieee80211_state_name[nstate]); - /* return (error); */ + return (error); } #ifdef LINUXKPI_DEBUG_80211