From nobody Wed Mar 08 05:51:57 2023 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 4PWhKB0v0Wz3xB7T; Wed, 8 Mar 2023 05:51:58 +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 4PWhK96sQgz3Q7f; Wed, 8 Mar 2023 05:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678254718; 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=iAa/+iwxxfl7h1OJmvPgs7CcXmODerKp4odi0a+VdTg=; b=OvR0slWd/MD/K3Y6jPtRBy6bNmC396eA55akSpY4t3dHy1n0vDPp3OlK9vAr0/P0QaEeRt dpdo8O7LrP/YOALjfPtw+gtCB4hLm1Ll7Qk7jB+lHgcW9/LgrgJ6rlBVrqMGxkGLniLeob pBwHd3VHbNnS+Nig7TOvNLKE7hT4KNnxE7/FGRJaUedC9xA0QafImUPMVS6laRjw9M8kl8 2k508Ih4DXdrzk+c00qn7yUN2qyPjylJVpZx0X3tN9NMARCiKBt7abq97JY6ZzOXnx5HtM gFJT4lGdtYKhoBakG+Q99it4Zj+iJ3IxJIN2EaVOo+E/FgvQNkXE5Fmq2siwAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678254718; 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=iAa/+iwxxfl7h1OJmvPgs7CcXmODerKp4odi0a+VdTg=; b=LdWnWKBj3KTQdR3iR/V3+KKJpwF9CRJzLMUxH6lOZoMRRVSE49bmYFIqzU4oaHThYMjBjk h8/T6QhgEiMRri8LJ7y8S0ZFxy+K436yyLPwxgfhSqOT4YZ6Y5aBEnXAo73xEwpj5t/r8L NQ9Wx7MQb5nABhOZrhTpmyWR48WkFIRMfUfdP6zyeAumopwEZJowcVNCTB7S4n9L9cXlfZ UO1O5Szp/nRKtFKbwF1r/YmqMXc4YskE7O54ud4Wuqkpbq/XZMogra9xKuQXVpzvOLdTyO mP7apIwjnQdyk4rChc6YUaRe72nyUwAAvAeztHOoqGdJ177Jcoe70VvXW58Nhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678254718; a=rsa-sha256; cv=none; b=rovA6/Rl7vQ0VlRqiz7Dy8VRxN+JmSBoGeA4vV8rQBlBHIPd0z4F2K9hFmWl7U71K3BTJa DCzGE1rQy6OqdDQBcTZhctqOVWGu09mQygBNzKtJBua97/2N64TVL3jasKb3B8/pNTiXsy kDVKZB7FmuTpn6PwLM3aH4S6jmzm1v9ZqB15sRBlywhdHmZCcIDJkgb7z4/C90avF9iYDp vJGGvonERf0mUQ790zm81TlbPg2wFZ8xeLUtA2kcvnJsNQ4UffiRwjJTJV2g/Ibfq3iy9p BUO1UUQGOTfFOQzio37BPMmVlgAL28UPddRP/CFl79D5pvvoSwDqsB8XYY3mVQ== 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 4PWhK95ybWzDy2; Wed, 8 Mar 2023 05:51:57 +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 3285pvZ3009664; Wed, 8 Mar 2023 05:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3285pv1V009663; Wed, 8 Mar 2023 05:51:57 GMT (envelope-from git) Date: Wed, 8 Mar 2023 05:51:57 GMT Message-Id: <202303080551.3285pv1V009663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 648bd2b1a6eb - releng/13.2 - linux_80211: Don't dequeue lsta if not queued 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 648bd2b1a6ebafddb07cbc024d42b99b7eaa1c9e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=648bd2b1a6ebafddb07cbc024d42b99b7eaa1c9e commit 648bd2b1a6ebafddb07cbc024d42b99b7eaa1c9e Author: Colin Percival AuthorDate: 2023-03-05 20:10:57 +0000 Commit: Colin Percival CommitDate: 2023-03-08 05:51:17 +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. Approved by: re (kib) (cherry picked from commit 3689f8aeab82150da6789be87b6c2f9385810c23) (cherry picked from commit 790dc4d825c910c8a2eda49fe9e6dd827519f0f4) --- 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 d0a3b4b8586a..06b52ebaec88 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;