From 6a18c96ba2e979edb33bf013a0de5bc60f98c6a8 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 1 Jul 2018 09:09:37 -0700 Subject: [PATCH] qcacld-3.0: Rename csr_roam_completeCallback Rename csr_roam_completeCallback to avoid having camelCase. Change-Id: Ic84cf07c352da5c445df599657a050feef997f1f CRs-Fixed: 2273780 --- core/hdd/inc/wlan_hdd_main.h | 2 +- core/hdd/src/wlan_hdd_main.c | 4 ++-- core/sap/src/sap_internal.h | 4 ++-- core/sme/inc/csr_api.h | 10 +++++----- core/sme/inc/csr_internal.h | 2 +- core/sme/inc/sme_api.h | 4 +++- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 2ba4595eb1d6..4f2df6212bb1 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -2083,7 +2083,7 @@ struct hdd_adapter *hdd_get_adapter_by_macaddr(struct hdd_context *hdd_ctx, tSirMacAddr macAddr); int hdd_vdev_create(struct hdd_adapter *adapter, - csr_roam_completeCallback callback, void *ctx); + csr_roam_complete_cb callback, void *ctx); int hdd_vdev_destroy(struct hdd_adapter *adapter); int hdd_vdev_ready(struct hdd_adapter *adapter); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 076f20537b26..917f4b3830cc 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -3996,7 +3996,7 @@ release_vdev: static int hdd_set_sme_session_param(struct hdd_adapter *adapter, struct sme_session_params *session_param, - csr_roam_completeCallback callback, + csr_roam_complete_cb callback, void *callback_ctx) { uint32_t type; @@ -4022,7 +4022,7 @@ static int hdd_set_sme_session_param(struct hdd_adapter *adapter, } int hdd_vdev_create(struct hdd_adapter *adapter, - csr_roam_completeCallback callback, void *ctx) + csr_roam_complete_cb callback, void *ctx) { QDF_STATUS status; int errno; diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h index 5a04cea43a9d..6ed9c84f434b 100644 --- a/core/sap/src/sap_internal.h +++ b/core/sap/src/sap_internal.h @@ -264,9 +264,9 @@ typedef struct sWLAN_SAPEvent { void *params; /* State machine input event message */ uint32_t event; - /* introduced to handle csr_roam_completeCallback roamStatus */ + /* introduced to handle csr_roam_complete_cb roamStatus */ uint32_t u1; - /* introduced to handle csr_roam_completeCallback roamResult */ + /* introduced to handle csr_roam_complete_cb roamResult */ uint32_t u2; } tWLAN_SAPEvent, *ptWLAN_SAPEvent; diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index eeb238fb5289..493e0742b7ab 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1664,11 +1664,11 @@ typedef QDF_STATUS (*csr_scan_completeCallback)(tHalHandle, void *p2, uint8_t sessionId, uint32_t scanID, eCsrScanStatus status); -typedef QDF_STATUS (*csr_roam_completeCallback)(void *pContext, - struct csr_roam_info *pParam, - uint32_t roamId, - eRoamCmdStatus roamStatus, - eCsrRoamResult roamResult); +typedef QDF_STATUS (*csr_roam_complete_cb)(void *context, + struct csr_roam_info *param, + uint32_t roam_id, + eRoamCmdStatus roam_status, + eCsrRoamResult roam_result); typedef QDF_STATUS (*csr_session_open_cb)(uint8_t session_id); typedef QDF_STATUS (*csr_session_close_cb)(uint8_t session_id); diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index fb8a8b00f331..ce37f37b21c0 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -834,7 +834,7 @@ struct csr_roam_session { csr_session_open_cb session_open_cb; csr_session_close_cb session_close_cb; - csr_roam_completeCallback callback; + csr_roam_complete_cb callback; void *pContext; eCsrConnectState connectState; struct rsn_caps rsn_caps; diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 3ee7a1ddcd29..27d8af7bab3a 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -233,6 +233,8 @@ struct sme_5g_band_pref_params { * struct sme_session_params: Session creation params passed by HDD layer * @session_open_cb: callback to be registered with SME for opening the session * @session_close_cb: callback to be registered with SME for closing the session + * @callback: callback to be invoked for roaming events + * @callback_ctx: user-supplied context to be passed back on roaming events * @self_mac_addr: Self mac address * @sme_session_id: SME session id * @type_of_persona: person type @@ -241,7 +243,7 @@ struct sme_5g_band_pref_params { struct sme_session_params { csr_session_open_cb session_open_cb; csr_session_close_cb session_close_cb; - csr_roam_completeCallback callback; + csr_roam_complete_cb callback; void *callback_ctx; uint8_t *self_mac_addr; uint8_t sme_session_id;