From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 547CF1C84DC; Mon, 2 Jun 2025 15:12:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877143; cv=none; b=IsKGCK7qeOpTaS8tkTUl+BySOZiaZ+bMYZxzHjIZZ6JXR+kdJPkvZCc1vBlninOfNozNGv0fUsCOz4AqHeSstS1W+4k5Jk65vm8odl9w1Jlaa6Wd2Ud+U4B3KQjc9SKXhXyr82+DpjKEYwft54/uezNHHlWWizN3OKckUQP6kK4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877143; c=relaxed/simple; bh=8hdhj9sOibrqLjRmG2S/wNVbk3hm4ZKJeDhwRqZMY6U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eoipIRl7bqtcWKVcD8ujeK7e8oy+RvXm40JwXOZDAiPbT6StFumjQmr18VCu5hkxtiR2Eeec43UuQlfJJ/RTGiUpxv7sHB6LtbBKIO52X9gcJXxs5bQP02CMsf77JvpLlNb8b7bOkx3/bPENo+AdJLViYK8ijqZj1ztGBoSUdUY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PmwMtcTb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PmwMtcTb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88694C4CEEE; Mon, 2 Jun 2025 15:12:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748877143; bh=8hdhj9sOibrqLjRmG2S/wNVbk3hm4ZKJeDhwRqZMY6U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PmwMtcTbVqfwSHfAIbY36PUi0IUVcX8flrEunYciRV5nWMRZb59HOjlgC2pk43giA 5kfIB5r/N/qfl8P7rmd8E/cd/1JZUyjGQFPtF9TST/+fJ8pZsgVwaduc49ZgSGJ+d2 1u8LBpV2A7/6Tcq17fJmUL0BbkvBLXsD2Sxnfi+A= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johannes Berg , Emmanuel Grumbach , Miri Korenblit , Sasha Levin Subject: [PATCH 6.1 186/325] wifi: mac80211: dont unconditionally call drv_mgd_complete_tx() Date: Mon, 2 Jun 2025 15:47:42 +0200 Message-ID: <20250602134327.365177546@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134319.723650984@linuxfoundation.org> References: <20250602134319.723650984@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johannes Berg [ Upstream commit 1798271b3604b902d45033ec569f2bf77e94ecc2 ] We might not have called drv_mgd_prepare_tx(), so only call drv_mgd_complete_tx() under the same conditions. Signed-off-by: Johannes Berg Reviewed-by: Emmanuel Grumbach Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20250205110958.e091fc39a351.Ie6a3cdca070612a0aa4b3c6914ab9ed602d1f456@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/mlme.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 9a5530ca2f6b2..8f0e6d7fe7167 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2896,7 +2896,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, if (tx) ieee80211_flush_queues(local, sdata, false); - drv_mgd_complete_tx(sdata->local, sdata, &info); + if (tx || frame_buf) + drv_mgd_complete_tx(sdata->local, sdata, &info); /* clear AP addr only after building the needed mgmt frames */ eth_zero_addr(sdata->deflink.u.mgd.bssid); -- 2.39.5