Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bef086e0 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://x-git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

parents 46fc4c90 7b119dc0

net/mac80211/mlme.c

+20 −4
Original line number Diff line number Diff line
@@ -3964,8 +3964,16 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, 
	/* prep auth_data so we don't go into idle on disassoc */

	ifmgd->auth_data = auth_data;



	if (ifmgd->associated)

		ieee80211_set_disassoc(sdata, 0, 0, false, NULL);

	if (ifmgd->associated) {

		u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];



		ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,

				       WLAN_REASON_UNSPECIFIED,

				       false, frame_buf);



		__cfg80211_send_deauth(sdata->dev, frame_buf,

				       sizeof(frame_buf));

	}



	sdata_info(sdata, "authenticate with %pM\n", req->bss->bssid);
@@ -4025,8 +4033,16 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 


	mutex_lock(&ifmgd->mtx);



	if (ifmgd->associated)

		ieee80211_set_disassoc(sdata, 0, 0, false, NULL);

	if (ifmgd->associated) {

		u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];



		ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,

				       WLAN_REASON_UNSPECIFIED,

				       false, frame_buf);



		__cfg80211_send_deauth(sdata->dev, frame_buf,

				       sizeof(frame_buf));

	}



	if (ifmgd->auth_data && !ifmgd->auth_data->done) {

		err = -EBUSY;