wifi: mac80211: don't unconditionally call drv_mgd_complete_tx()

[ 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 <johannes.berg@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250205110958.e091fc39a351.Ie6a3cdca070612a0aa4b3c6914ab9ed602d1f456@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index f92cbbc32a9e5c403b5811683cdf6162a24a4ac7..3bd1c4eeae52fe1f3dd45fb622e91b483c9ccf50 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3832,7 +3832,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);