From nobody Sun Mar 5 20:16:26 2023 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 4PVCf30z60z3tvJd; Sun, 5 Mar 2023 20:16:27 +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 4PVCf30VHnz3thm; Sun, 5 Mar 2023 20:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678047387; 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=JKuNTTR/X2jXHG+VmOkFR1PGHpIiZMn1RJhVbPAkkNo=; b=ANBgbi9f0Gq5M5hFPfk3uyJcB8QIFMzLL6sdjgnedALFRqLx94D9RyC+/P5gLXjPqTH96m 0SbvH707q9nLTjBm5wYbhwlgK4Zk1z9rcKkKNhnrLDL/PbZtVNylNEvpmTIKF40KykOVLB zf6YK+z1WCz+106zS9lxi6pPstjkW4+onqu6zJ9ChpJwyuGoUuSol4DlABgnfgGRhVUmV2 StiIn59CmZ6oozffvlnA6hGHu9StKd9numdd7rDsWwAEXeELBr8qWtOyeBX9z2vvMvSdnR tDphF0cTUS3FhE9H0jiWXUQug1nno0cDD+i/8B01t/8h2bubn06FlHYm7MOmeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678047387; 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=JKuNTTR/X2jXHG+VmOkFR1PGHpIiZMn1RJhVbPAkkNo=; b=A7HFlcVqjhATw4KABZ6e4BqaqinPHyoCGP1+lDQTKI31rhgKjx5DoWJTRD6GBYLYQa5Y0a e1b3GMS0QRkzcRUWicjePF+ihcROCs4uMyTiy5nsZ0v5HQRb1Df0J5Qglo7VHIyLnweB57 EUJLYetTHFctF9PUP7BzCy9LijqO7xkmeEd1UEpfwTWclsKWyqSfL0X5Vde7jixUdviip6 Vh7pIpheWcNIc1T1CRIoEIfrBMjvyUFGpt6GId5cIGK16mInshTpDEtPUnoL2nT5AZfs2f Si50erLWLbYHOjgHzu3eiy2zqPIXeEzaplPgtWUdCOxIP6zg1u0WslFrgPIEwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678047387; a=rsa-sha256; cv=none; b=bkJ4kLAbRg4uap4bJAi/kBuX1MvoDORYQuMqbIWtXpf46grlTBcbUneeQwCndFCiScvFX+ +/Kc59UZORtbWET38aMk9zycHi/PwcyJG8ecfjUIgK+VNulQrk6Un+yaJrCf8PWjT9R9Zo 0k0qHF7I66IxLss3rBuHYTTtjduVgAk1EbMmaHZ6/ZSWV5ip4DJdDmLSM9VYeG1PX8JPBq aIAE0nT+JWHxKM9/lLgVpdY3+h3H08NYzyGifoqYzdNdgX4peDhipQY65OO1b1EzbWNtdD kNvUrbIVNDv7/9Fqdb++Cq9b+PjrF51ac/TMYUuus1uhLNKPUa08vJ+w3FqOHw== 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 4PVCf26hC6zZ9M; Sun, 5 Mar 2023 20:16:26 +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 325KGQmI023322; Sun, 5 Mar 2023 20:16:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 325KGQuf023321; Sun, 5 Mar 2023 20:16:26 GMT (envelope-from git) Date: Sun, 5 Mar 2023 20:16:26 GMT Message-Id: <202303052016.325KGQuf023321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 3689f8aeab82 - main - linux_80211: Don't dequeue lsta if not queued 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3689f8aeab82150da6789be87b6c2f9385810c23 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3689f8aeab82150da6789be87b6c2f9385810c23 commit 3689f8aeab82150da6789be87b6c2f9385810c23 Author: Colin Percival AuthorDate: 2023-03-05 20:10:57 +0000 Commit: Colin Percival CommitDate: 2023-03-05 20:16:22 +0000 linux_80211: Don't dequeue lsta if not queued This fixes an instapanic when restarting wpa_supplicant on my laptop's iwlwifi device. After this change, iwlwifi enters a nonfunctional state if wpa_supplicant is restarted, but "service netif restart wlan0" is enough to get it working again. releng/13.2 candidate. Reviewed by: bz MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index fdfa384c1a25..5b9792ed664e 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -174,10 +174,13 @@ lkpi_lsta_remove(struct lkpi_sta *lsta, struct lkpi_vif *lvif) { struct ieee80211_node *ni; + IMPROVE("XXX-BZ remove tqe_prev check once ni-sta-state-sync is fixed"); + ni = lsta->ni; LKPI_80211_LVIF_LOCK(lvif); - TAILQ_REMOVE(&lvif->lsta_head, lsta, lsta_entry); + if (lsta->lsta_entry.tqe_prev != NULL) + TAILQ_REMOVE(&lvif->lsta_head, lsta, lsta_entry); LKPI_80211_LVIF_UNLOCK(lvif); lsta->ni = NULL;