From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 5 Feb 2025 09:39:21 +0000 (+0200)
Subject: wifi: mac80211: remove misplaced drv_mgd_complete_tx() call
X-Git-Tag: v6.15-rc1~160^2~184^2~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4995cdc4d02d0abc8e9fcccad5c71ce676c1e3f;p=thirdparty%2Flinux.git

wifi: mac80211: remove misplaced drv_mgd_complete_tx() call

In the original commit 15fae3410f1d ("mac80211: notify driver on
mgd TX completion") I evidently made a mistake and placed the
call in the "associated" if, rather than the "assoc_data". Later
I noticed the missing call and placed it in commit c042600c17d8
("wifi: mac80211: adding missing drv_mgd_complete_tx() call"),
but didn't remove the wrong one. Remove it now.

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.6ed954179bbf.Id8ef8835b7e6da3bf913c76f77d201017dc8a3c9@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 184b328d92cb0..bb3e42afd34ef 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -9751,7 +9751,6 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
 		ieee80211_report_disconnect(sdata, frame_buf,
 					    sizeof(frame_buf), true,
 					    req->reason_code, false);
-		drv_mgd_complete_tx(sdata->local, sdata, &info);
 		return 0;
 	}