forked from Minki/linux
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: Jouni Malinen <j@w1.fi> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
2430816b4e
commit
de3d43a37d
@ -4370,7 +4370,7 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
|
|||||||
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
|
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
|
||||||
u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
|
u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
|
||||||
bool tx = !req->local_state_change;
|
bool tx = !req->local_state_change;
|
||||||
bool sent_frame = false;
|
bool report_frame = false;
|
||||||
|
|
||||||
mutex_lock(&ifmgd->mtx);
|
mutex_lock(&ifmgd->mtx);
|
||||||
|
|
||||||
@ -4387,7 +4387,7 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
|
|||||||
ieee80211_destroy_auth_data(sdata, false);
|
ieee80211_destroy_auth_data(sdata, false);
|
||||||
mutex_unlock(&ifmgd->mtx);
|
mutex_unlock(&ifmgd->mtx);
|
||||||
|
|
||||||
sent_frame = tx;
|
report_frame = true;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4395,12 +4395,12 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
|
|||||||
ether_addr_equal(ifmgd->associated->bssid, req->bssid)) {
|
ether_addr_equal(ifmgd->associated->bssid, req->bssid)) {
|
||||||
ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
|
ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
|
||||||
req->reason_code, tx, frame_buf);
|
req->reason_code, tx, frame_buf);
|
||||||
sent_frame = tx;
|
report_frame = true;
|
||||||
}
|
}
|
||||||
mutex_unlock(&ifmgd->mtx);
|
mutex_unlock(&ifmgd->mtx);
|
||||||
|
|
||||||
out:
|
out:
|
||||||
if (sent_frame)
|
if (report_frame)
|
||||||
__cfg80211_send_deauth(sdata->dev, frame_buf,
|
__cfg80211_send_deauth(sdata->dev, frame_buf,
|
||||||
IEEE80211_DEAUTH_FRAME_LEN);
|
IEEE80211_DEAUTH_FRAME_LEN);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user