From nobody Sun Jun 26 21:27:04 2022 X-Original-To: dev-commits-src-main@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 3F8EE87F382; Sun, 26 Jun 2022 21:27:05 +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 4LWP7s1HZnz3jFS; Sun, 26 Jun 2022 21:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656278825; 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=mo9ZEfVGN1MhY4Lbv3+M3GL4q5C1L7D2jWKz1Er0nnk=; b=T3wXeJNnilpATDLmS6Qj3OuF5CGMke6s6ctqTvUsLds2oZ+FRAXrm3oHuIne/g0OVtaebY 2z9VhXLwodwDkas6rL2h9Xjr1H4kilqTx7BwBy3emq3F1P2kwOa2r8srpXA2kQLX/1bss/ uUfg3IxK2G3CLSmQ7JECpx/N6ihSLCGd/urWAYEEpMZ4vi4mVGIfXeIM0kVUn2TXN/Aknu Pw5RVfEsZ8opAdF4Bow+hFQ83Qx0NzxvJIqWJy70iYURf+IqHF3sBz53am2x7AFUhei5r5 Jj4ofS6TUCzYEwUicWoojVRzFBADabTgsd+a9jolNARrXCWIgKVowDUJ4DRtWg== 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 067BA1B6D4; Sun, 26 Jun 2022 21:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25QLR4DM007073; Sun, 26 Jun 2022 21:27:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25QLR42a007072; Sun, 26 Jun 2022 21:27:04 GMT (envelope-from git) Date: Sun, 26 Jun 2022 21:27:04 GMT Message-Id: <202206262127.25QLR42a007072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9597f7cb99b0 - main - Revert "LinuxKPI: 802.11: fix iwlwifi fw assert with older chipsets" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9597f7cb99b03ecb457b160de621ce3a90bb3e5b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656278825; 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=mo9ZEfVGN1MhY4Lbv3+M3GL4q5C1L7D2jWKz1Er0nnk=; b=ifdFYgxMc9ytC5+9axPDcPAIjDwNBXH64F2EFFs34bl7XbWaNQ5usfmzsiNQkthsvgT351 fLkGav2apy/X1ZBIIVBIlrd+vjA2yiPS5SlunDAlTM2+7cHVlZJfm+5a7iRj/mu9Rn1+bQ /x3WmqoDOldt6GLzEKqt6rdtivJSDTYj27DhNLYcKVERPRDAj26p0zFaE4RGwgtg0i823a LhS9GYxTOTZJX7cs1xNrDhH6+iBziGhFo+1sVSeRhLKFEFzVWJo0kbeLDVyqz0glMl0G1w AnxoQeGKmnMlDRCJ+X4jp1dAvgCfw2YaiUofkk8u9YonxYPncuNnnngxPW+/iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656278825; a=rsa-sha256; cv=none; b=PliKBvTFEdJ+HnmjmCwsk0wDMIRBvCvgDT0WR4jmAvHB/4FfgEwPGyR3XnTCtU4rzwLU/D YpnYgcgQsD6XvVDpYuUeHsQ9E9qP7Zde6xGGhSmKJIEwFGEO+Y+Ir74VYv1FccWLV18ZMl uTOLZDICkkg04FcJymtxJkkFUSdkxqufPS4aBHnSEjWVc0cmSlp3LkPASi/5UrnhYieyOn KMXSDGJrA3qUAt6tCbeYUMeIm+1GRmhyzaK1cP2pUBQYAuWgi8IwbeaO8HetCaS6Tb4mmT +e0SoJeRiM07BUHrzDBn6EwWOizPngXhX8J/+8nV1axAjkCSZ6N9Ahuy2fYWfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9597f7cb99b03ecb457b160de621ce3a90bb3e5b commit 9597f7cb99b03ecb457b160de621ce3a90bb3e5b Author: Bjoern A. Zeeb AuthorDate: 2022-06-26 18:50:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-06-26 18:50:36 +0000 Revert "LinuxKPI: 802.11: fix iwlwifi fw assert with older chipsets" This reverts commit 013e516dc9b1b32e9422ab02a875a05fc2d32f39. --- sys/compat/linuxkpi/common/src/linux_80211.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 6b265d0e4b2b..0328ff1c7c98 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1509,14 +1509,23 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int vif = LVIF_TO_VIF(lvif); IEEE80211_UNLOCK(vap->iv_ic); + ni = NULL; IMPROVE("ponder some of this moved to ic_newassoc, scan_assoc_success, " "and to lesser extend ieee80211_notify_node_join"); + /* Finish assoc. */ + /* Update sta_state (AUTH to ASSOC) and set aid. */ ni = ieee80211_ref_node(vap->iv_bss); lsta = ni->ni_drv_data; KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); + KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not " + "AUTH: %#x\n", __func__, lsta, lsta->state)); sta = LSTA_TO_STA(lsta); + sta->aid = IEEE80211_NODE_AID(ni); + error = lkpi_80211_mo_sta_state(hw, vif, sta, IEEE80211_STA_ASSOC); + if (error != 0) + goto out; IMPROVE("wme / conf_tx [all]"); @@ -1550,16 +1559,6 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); - /* This MUST come after the bss_info_changed. */ - /* Finish assoc. */ - /* Update sta_state (AUTH to ASSOC) and set aid. */ - KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not " - "AUTH: %#x\n", __func__, lsta, lsta->state)); - sta->aid = IEEE80211_NODE_AID(ni); - error = lkpi_80211_mo_sta_state(hw, vif, sta, IEEE80211_STA_ASSOC); - if (error != 0) - goto out; - /* - change_chanctx (if needed) * - event_callback */