Commit de3d43a3 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: report deauth to cfg80211 for local state change 



Even if the frame isn't transmitted to the AP, we need to
report it to cfg80211 so the state there can be updated
correctly.

Reported-by: default avatarJouni Malinen <j@w1.fi>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 2430816b

net/mac80211/mlme.c

+4 −4
Original line number Diff line number Diff line
@@ -4370,7 +4370,7 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, 
	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];

	bool tx = !req->local_state_change;

	bool sent_frame = false;

	bool report_frame = false;



	mutex_lock(&ifmgd->mtx);
@@ -4387,7 +4387,7 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, 
		ieee80211_destroy_auth_data(sdata, false);

		mutex_unlock(&ifmgd->mtx);



		sent_frame = tx;

		report_frame = true;

		goto out;

	}
@@ -4395,12 +4395,12 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, 
	    ether_addr_equal(ifmgd->associated->bssid, req->bssid)) {

		ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,

				       req->reason_code, tx, frame_buf);

		sent_frame = tx;

		report_frame = true;

	}

	mutex_unlock(&ifmgd->mtx);



 out:

	if (sent_frame)

	if (report_frame)

		__cfg80211_send_deauth(sdata->dev, frame_buf,

				       IEEE80211_DEAUTH_FRAME_LEN);