qcacmn: VDEV MLME SM changes
1) Fixes to enable VDEV MLME SM with legacy code 2) Define/Enable PDEV MLME component object. Change-Id: Ieb87e5b7b70d6bb593ba0950297894a81c6a4feb CRs-Fixed: 2384173
This commit is contained in:
@@ -1,19 +1,17 @@
|
||||
/*
|
||||
* Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for
|
||||
* any purpose with or without fee is hereby granted, provided that the
|
||||
* above copyright notice and this permission notice appear in all
|
||||
* copies.
|
||||
* Permission to use, copy, modify, and/or distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
|
||||
* WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
|
||||
* AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
||||
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
||||
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "cfg_dispatcher.h"
|
||||
@@ -27,7 +25,7 @@
|
||||
#include <wlan_ftm_init_deinit_api.h>
|
||||
#include <wlan_mgmt_txrx_utils_api.h>
|
||||
#include <wlan_serialization_api.h>
|
||||
#include <wlan_vdev_mlme_main.h>
|
||||
#include <include/wlan_mlme_cmn.h>
|
||||
#ifdef WLAN_ATF_ENABLE
|
||||
#include <wlan_atf_utils_api.h>
|
||||
#endif
|
||||
@@ -721,8 +719,8 @@ QDF_STATUS dispatcher_init(void)
|
||||
if (QDF_STATUS_SUCCESS != dispatcher_spectral_init())
|
||||
goto spectral_init_fail;
|
||||
|
||||
if (QDF_STATUS_SUCCESS != wlan_vdev_mlme_init())
|
||||
goto vdev_mlme_init_fail;
|
||||
if (QDF_STATUS_SUCCESS != wlan_cmn_mlme_init())
|
||||
goto cmn_mlme_init_fail;
|
||||
|
||||
/*
|
||||
* scheduler INIT has to be the last as each component's
|
||||
@@ -735,8 +733,8 @@ QDF_STATUS dispatcher_init(void)
|
||||
return QDF_STATUS_SUCCESS;
|
||||
|
||||
scheduler_init_fail:
|
||||
wlan_vdev_mlme_deinit();
|
||||
vdev_mlme_init_fail:
|
||||
wlan_cmn_mlme_deinit();
|
||||
cmn_mlme_init_fail:
|
||||
dispatcher_spectral_deinit();
|
||||
spectral_init_fail:
|
||||
cfg_dispatcher_deinit();
|
||||
@@ -786,7 +784,7 @@ QDF_STATUS dispatcher_deinit(void)
|
||||
|
||||
QDF_BUG(QDF_STATUS_SUCCESS == scheduler_deinit());
|
||||
|
||||
QDF_BUG(QDF_STATUS_SUCCESS == wlan_vdev_mlme_deinit());
|
||||
QDF_BUG(QDF_STATUS_SUCCESS == wlan_cmn_mlme_deinit());
|
||||
|
||||
status = cfg_dispatcher_deinit();
|
||||
QDF_BUG(QDF_IS_STATUS_SUCCESS(status));
|
||||
|
Reference in New Issue
Block a user