mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 03:30:53 +07:00
Merge branch 'for-john' of git://x-git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
This commit is contained in:
commit
bef086e08e
@ -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 */
|
/* prep auth_data so we don't go into idle on disassoc */
|
||||||
ifmgd->auth_data = auth_data;
|
ifmgd->auth_data = auth_data;
|
||||||
|
|
||||||
if (ifmgd->associated)
|
if (ifmgd->associated) {
|
||||||
ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
|
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);
|
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);
|
mutex_lock(&ifmgd->mtx);
|
||||||
|
|
||||||
if (ifmgd->associated)
|
if (ifmgd->associated) {
|
||||||
ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
|
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) {
|
if (ifmgd->auth_data && !ifmgd->auth_data->done) {
|
||||||
err = -EBUSY;
|
err = -EBUSY;
|
||||||
|
Loading…
Reference in New Issue
Block a user