From 6bac5aefe2c9f20a4bcf2638ebe40c5a494ce660 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Dhanotiya Date: Mon, 28 Sep 2020 14:27:38 +0530 Subject: [PATCH] qcacmn: Resolve compilation errors Change Ic166c112189ef79a84f61d16e7e04a6334c61178 renames few files for osif in connection manager, but does not take care of the compilation issue after rename of the files. Add a change to take care of the compilation errors in connection manager module. Change-Id: Icecb3f7aa625a65b835c15890fc019917e2b9446 CRs-Fixed: 2786828 --- os_if/linux/mlme/inc/osif_cm_req.h | 8 ++++---- os_if/linux/mlme/inc/osif_cm_util.h | 8 ++++---- os_if/linux/mlme/src/osif_cm_connect_rsp.c | 6 +++--- os_if/linux/mlme/src/osif_cm_disconnect_rsp.c | 6 +++--- os_if/linux/mlme/src/osif_cm_req.c | 6 +++--- os_if/linux/mlme/src/osif_cm_roam_rsp.c | 2 +- os_if/linux/mlme/src/osif_cm_rsp.h | 8 ++++---- os_if/linux/mlme/src/osif_cm_util.c | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/os_if/linux/mlme/inc/osif_cm_req.h b/os_if/linux/mlme/inc/osif_cm_req.h index f2917aa13e33..0abdf04fb470 100644 --- a/os_if/linux/mlme/inc/osif_cm_req.h +++ b/os_if/linux/mlme/inc/osif_cm_req.h @@ -15,14 +15,14 @@ */ /** - * DOC: wlan_cfg80211_cm_req.h + * DOC: osif_cm_req.h * * This header file maintains declarations of connect, disconnect, roam * request apis. */ -#ifndef __WLAN_CFG80211_CM_REQ_H -#define __WLAN_CFG80211_CM_REQ_H +#ifndef __OSIF_CM_REQ_H +#define __OSIF_CM_REQ_H #ifdef FEATURE_CM_ENABLE #include "qdf_status.h" @@ -54,4 +54,4 @@ int osif_cm_disconnect(struct net_device *dev, struct wlan_objmgr_vdev *vdev, uint16_t reason); #endif -#endif /* __WLAN_CFG80211_CM_REQ_H */ +#endif /* __OSIF_CM_REQ_H */ diff --git a/os_if/linux/mlme/inc/osif_cm_util.h b/os_if/linux/mlme/inc/osif_cm_util.h index 401d2a90fd70..eb7d8eb16848 100644 --- a/os_if/linux/mlme/inc/osif_cm_util.h +++ b/os_if/linux/mlme/inc/osif_cm_util.h @@ -15,14 +15,14 @@ */ /** - * DOC: wlan_cfg80211_cm_util.h + * DOC: osif_cm_util.h * * This header file maintains declarations of connect, disconnect, roam * common apis. */ -#ifndef __WLAN_CFG80211_CM_UTIL_H -#define __WLAN_CFG80211_CM_UTIL_H +#ifndef __OSIF_CM_UTIL_H +#define __OSIF_CM_UTIL_H #include #include "wlan_cm_ucfg_api.h" @@ -104,4 +104,4 @@ void osif_cm_reset_id_and_src_no_lock(struct vdev_osif_priv *osif_priv); */ QDF_STATUS osif_cm_reset_id_and_src(struct wlan_objmgr_vdev *vdev); -#endif /* __WLAN_CFG80211_CM_UTIL_H */ +#endif /* __OSIF_CM_UTIL_H */ diff --git a/os_if/linux/mlme/src/osif_cm_connect_rsp.c b/os_if/linux/mlme/src/osif_cm_connect_rsp.c index a04dd35fb25c..4bf4e4e18666 100644 --- a/os_if/linux/mlme/src/osif_cm_connect_rsp.c +++ b/os_if/linux/mlme/src/osif_cm_connect_rsp.c @@ -15,7 +15,7 @@ */ /** - * DOC: wlan_cfg80211_cm_connect_rsp.c + * DOC: osif_cm_connect_rsp.c * * This file maintains definitaions of connect response apis. */ @@ -24,8 +24,8 @@ #include #include #include "wlan_osif_priv.h" -#include "wlan_cfg80211_cm_rsp.h" -#include "wlan_cfg80211_cm_util.h" +#include "osif_cm_rsp.h" +#include "osif_cm_util.h" #include "wlan_cfg80211.h" #include "wlan_cfg80211_scan.h" diff --git a/os_if/linux/mlme/src/osif_cm_disconnect_rsp.c b/os_if/linux/mlme/src/osif_cm_disconnect_rsp.c index 4007840b2d79..fd7f47f04af4 100644 --- a/os_if/linux/mlme/src/osif_cm_disconnect_rsp.c +++ b/os_if/linux/mlme/src/osif_cm_disconnect_rsp.c @@ -15,7 +15,7 @@ */ /** - * DOC: wlan_cfg80211_cm_disconnect_rsp.c + * DOC: osif_cm_disconnect_rsp.c * * This file maintains definitaions of disconnect response * fucntions. @@ -23,9 +23,9 @@ #include #include -#include "wlan_cfg80211_cm_rsp.h" +#include "osif_cm_rsp.h" #include "wlan_osif_priv.h" -#include "wlan_cfg80211_cm_util.h" +#include "osif_cm_util.h" /** * osif_validate_disconnect_and_reset_src_id() - Validate disconnection diff --git a/os_if/linux/mlme/src/osif_cm_req.c b/os_if/linux/mlme/src/osif_cm_req.c index 8c3f1d46a20b..5f151e06b162 100644 --- a/os_if/linux/mlme/src/osif_cm_req.c +++ b/os_if/linux/mlme/src/osif_cm_req.c @@ -15,17 +15,17 @@ */ /** - * DOC: wlan_cfg80211_cm_req.c + * DOC: osif_cm_req.c * * This file maintains definitaions of connect, disconnect, roam * request apis. */ -#include "wlan_cfg80211_cm_req.h" +#include "osif_cm_req.h" #include "wlan_cm_ucfg_api.h" #include "wlan_nl_to_crypto_params.h" #include -#include "wlan_cfg80211_cm_util.h" +#include "osif_cm_util.h" static void osif_cm_free_wep_key_params(struct wlan_cm_connect_req *connect_req) { diff --git a/os_if/linux/mlme/src/osif_cm_roam_rsp.c b/os_if/linux/mlme/src/osif_cm_roam_rsp.c index d00e27194244..8655eda5ec4a 100644 --- a/os_if/linux/mlme/src/osif_cm_roam_rsp.c +++ b/os_if/linux/mlme/src/osif_cm_roam_rsp.c @@ -15,7 +15,7 @@ */ /** - * DOC: wlan_cfg80211_cm_roam_rsp.c + * DOC: osif_cm_roam_rsp.c * * This file maintains definitaions of roam response apis. */ diff --git a/os_if/linux/mlme/src/osif_cm_rsp.h b/os_if/linux/mlme/src/osif_cm_rsp.h index 7ab90a3067ac..bb6b3fc911e0 100644 --- a/os_if/linux/mlme/src/osif_cm_rsp.h +++ b/os_if/linux/mlme/src/osif_cm_rsp.h @@ -15,14 +15,14 @@ */ /** - * DOC: wlan_cfg80211_cm_rsp.h + * DOC: osif_cm_rsp.h * * This header file maintains declarations of connect, disconnect, roam * response apis. */ -#ifndef __WLAN_CFG80211_CM_RSP_H -#define __WLAN_CFG80211_CM_RSP_H +#ifndef __OSIF_CM_RSP_H +#define __OSIF_CM_RSP_H #include "wlan_objmgr_vdev_obj.h" #include "wlan_cm_public_struct.h" @@ -71,4 +71,4 @@ QDF_STATUS osif_connect_handler(struct wlan_objmgr_vdev *vdev, QDF_STATUS osif_failed_candidate_handler(struct wlan_objmgr_vdev *vdev, struct wlan_cm_connect_rsp *rsp); -#endif /* __WLAN_CFG80211_CM_RSP_H */ +#endif /* __OSIF_CM_RSP_H */ diff --git a/os_if/linux/mlme/src/osif_cm_util.c b/os_if/linux/mlme/src/osif_cm_util.c index b2e40ff5d755..c6c440a643b7 100644 --- a/os_if/linux/mlme/src/osif_cm_util.c +++ b/os_if/linux/mlme/src/osif_cm_util.c @@ -15,16 +15,16 @@ */ /** - * DOC: wlan_cfg80211_cm_util.c + * DOC: osif_cm_util.c * * This file maintains definitaions of connect, disconnect, roam * common apis. */ #include -#include "wlan_cfg80211_cm_util.h" +#include "osif_cm_util.h" #include "wlan_osif_priv.h" #include "wlan_cfg80211.h" -#include "wlan_cfg80211_cm_rsp.h" +#include "osif_cm_rsp.h" const char * osif_cm_qca_reason_to_str(enum qca_disconnect_reason_codes reason)