mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-15 09:14:18 -04:00
Merge "qcacld-3.0: Fix TDLS set state cmd sequence in concurrent TDLS connections" into wlan-cld3.driver.lnx.2.0-dev
This commit is contained in:
commit
d7d95fa17f
3 changed files with 8 additions and 5 deletions
|
|
@ -1256,7 +1256,8 @@ static void hdd_send_association_event(struct net_device *dev,
|
|||
hdd_debug("LFR3:hdd_send_association_event");
|
||||
/* Update tdls module about the disconnection event */
|
||||
hdd_notify_sta_disconnect(adapter->sessionId,
|
||||
true, adapter->hdd_vdev);
|
||||
true, false,
|
||||
adapter->hdd_vdev);
|
||||
}
|
||||
#endif
|
||||
if (eConnectionState_Associated == sta_ctx->conn_info.connState) {
|
||||
|
|
@ -1407,6 +1408,7 @@ static void hdd_send_association_event(struct net_device *dev,
|
|||
hdd_lpass_notify_disconnect(adapter);
|
||||
/* Update tdls module about the disconnection event */
|
||||
hdd_notify_sta_disconnect(adapter->sessionId,
|
||||
false,
|
||||
false,
|
||||
adapter->hdd_vdev);
|
||||
|
||||
|
|
|
|||
|
|
@ -17526,12 +17526,10 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy,
|
|||
adapter->sessionId, INVALID_SCAN_ID, false);
|
||||
}
|
||||
wlan_hdd_cleanup_remain_on_channel_ctx(adapter);
|
||||
#ifdef FEATURE_WLAN_TDLS
|
||||
/* First clean up the tdls peers if any */
|
||||
/* TDLS-TODO */
|
||||
hdd_notify_sta_disconnect(adapter->sessionId,
|
||||
true, adapter->hdd_vdev);
|
||||
#endif
|
||||
false, true, adapter->hdd_vdev);
|
||||
|
||||
hdd_info("Disconnect request from user space with reason: %d (%s) internal reason code: %d",
|
||||
reason, hdd_ieee80211_reason_code_to_str(reason), reasonCode);
|
||||
status = wlan_hdd_disconnect(adapter, reasonCode);
|
||||
|
|
|
|||
|
|
@ -3188,6 +3188,9 @@ tSirRetStatus lim_process_sme_del_all_tdls_peers(tpAniSirGlobal p_mac,
|
|||
|
||||
lim_check_aid_and_delete_peer(p_mac, session_entry);
|
||||
|
||||
tgt_tdls_peers_deleted_notification(p_mac->psoc,
|
||||
session_entry->smeSessionId);
|
||||
|
||||
return eSIR_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue