mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

cfg80211: Support all iftypes in autodisconnect_wk

Browse source 
Currently autodisconnect_wk assumes that only interface types of
P2P_CLIENT and STATION use conn_owner_nlportid.  Change this so all
interface types are supported.

Signed-off-by: Denis Kenzior <denkenz@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Denis Kenzior 2018-03-26 12:52:44 -05:00 committed by Johannes Berg
parent 2c390e44e4
commit 37b1c00468
1 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
net/wireless/sme.c
View file

@ -1239,17 +1239,38 @@ void cfg80211_autodisconnect_wk(struct work_struct *work)
wdev_lock(wdev); wdev_lock(wdev);
if (wdev->conn_owner_nlportid) { if (wdev->conn_owner_nlportid) {
/* switch (wdev->iftype) {
* Use disconnect_bssid if still connecting and ops->disconnect case NL80211_IFTYPE_ADHOC:
* not implemented. Otherwise we can use cfg80211_disconnect. cfg80211_leave_ibss(rdev, wdev->netdev, false);
*/ break;
if (rdev->ops->disconnect || wdev->current_bss) case NL80211_IFTYPE_AP:
cfg80211_disconnect(rdev, wdev->netdev, case NL80211_IFTYPE_P2P_GO:
WLAN_REASON_DEAUTH_LEAVING, true); cfg80211_stop_ap(rdev, wdev->netdev, false);
else break;
cfg80211_mlme_deauth(rdev, wdev->netdev, case NL80211_IFTYPE_MESH_POINT:
wdev->disconnect_bssid, NULL, 0, cfg80211_leave_mesh(rdev, wdev->netdev);
WLAN_REASON_DEAUTH_LEAVING, false); break;
case NL80211_IFTYPE_STATION:
case NL80211_IFTYPE_P2P_CLIENT:
/*
* Use disconnect_bssid if still connecting and
* ops->disconnect not implemented. Otherwise we can
* use cfg80211_disconnect.
*/
if (rdev->ops->disconnect || wdev->current_bss)
cfg80211_disconnect(rdev, wdev->netdev,
WLAN_REASON_DEAUTH_LEAVING,
true);
else
cfg80211_mlme_deauth(rdev, wdev->netdev,
wdev->disconnect_bssid,
NULL, 0,
WLAN_REASON_DEAUTH_LEAVING,
false);
break;
default:
break;
}
} }
wdev_unlock(wdev); wdev_unlock(wdev);