瀏覽代碼

qcacld-3.0: Rename SAP Event Callback identifiers

The Linux Coding Style frowns upon mixed-case names and so-called
Hungarian notation, so rename SAP Event Callback identifiers
tpWLAN_SAPEventCB, pfnSapEventCallback, pSapEventCallback, and
pacs_event_callback to be compliant.

Change-Id: I6ce97af649c73dd779b23c7ec4f0192f28d0f00a
CRs-Fixed: 2422210
Jeff Johnson 6 年之前
父節點
當前提交
7dcac7ecbf

+ 1 - 1
core/hdd/src/wlan_hdd_cfg80211.c

@@ -1784,7 +1784,7 @@ int wlan_hdd_cfg80211_start_acs(struct hdd_adapter *adapter)
 
 	struct hdd_context *hdd_ctx;
 	tsap_config_t *sap_config;
-	tpWLAN_SAPEventCB acs_event_callback;
+	sap_event_cb acs_event_callback;
 	uint8_t mcc_to_scc_switch = 0;
 	int status;
 

+ 1 - 1
core/hdd/src/wlan_hdd_hostapd.c

@@ -4902,7 +4902,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	eCsrEncryptionType mc_rsn_encrypt_type;
 	int status = QDF_STATUS_SUCCESS, ret;
 	int qdf_status = QDF_STATUS_SUCCESS;
-	tpWLAN_SAPEventCB sap_event_callback;
+	sap_event_cb sap_event_callback;
 	struct hdd_hostapd_state *hostapd_state;
 	mac_handle_t mac_handle;
 	int32_t i;

+ 7 - 7
core/sap/inc/sap_api.h

@@ -372,7 +372,7 @@ struct sap_ch_change_ind {
 };
 
 /*
- * This struct will be filled in and passed to tpWLAN_SAPEventCB that is
+ * This struct will be filled in and passed to sap_event_cb that is
  * provided during wlansap_start_bss call The event id corresponding to
  * structure  in the union is defined in comment next to the structure
  */
@@ -749,8 +749,8 @@ bool sap_is_auto_channel_select(struct sap_context *sapcontext);
 
 QDF_STATUS wlansap_global_init(void);
 QDF_STATUS wlansap_global_deinit(void);
-typedef QDF_STATUS (*tpWLAN_SAPEventCB)(struct sap_event *pSapEvent,
-					void *user_context);
+typedef QDF_STATUS (*sap_event_cb)(struct sap_event *sap_event,
+				   void *user_context);
 
 /**
  * wlansap_is_channel_in_nol_list() - This API checks if channel is
@@ -781,7 +781,7 @@ bool wlansap_is_channel_leaking_in_nol(struct sap_context *sap_ctx,
 /**
  * wlansap_start_bss() - start BSS
  * @sap_ctx: Pointer to the SAP context
- * @pSapEventCallback: Callback function in HDD called by SAP to inform HDD
+ * @sap_event_cb: Callback function in HDD called by SAP to inform HDD
  *                        about SAP results
  * @config: Pointer to configuration structure passed down from
  *                    HDD(HostApd for Android)
@@ -797,7 +797,7 @@ bool wlansap_is_channel_leaking_in_nol(struct sap_context *sap_ctx,
  *         QDF_STATUS_SUCCESS: Success
  */
 QDF_STATUS wlansap_start_bss(struct sap_context *sap_ctx,
-			     tpWLAN_SAPEventCB pSapEventCallback,
+			     sap_event_cb sap_event_cb,
 			     tsap_config_t *config, void *user_context);
 
 /**
@@ -1276,7 +1276,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac,
 /**
  * wlansap_acs_chselect() - Initiates acs channel selection
  * @sap_context:               Pointer to SAP context structure
- * @pacs_event_callback:       Callback function in hdd called by sap
+ * @acs_event_callback:       Callback function in hdd called by sap
  *                             to inform hdd about channel selection result
  * @pconfig:                   Pointer to configuration structure
  *                             passed down from hdd
@@ -1289,7 +1289,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac,
  * Return: The QDF_STATUS code associated with performing the operation.
  */
 QDF_STATUS wlansap_acs_chselect(struct sap_context *sap_context,
-				tpWLAN_SAPEventCB pacs_event_callback,
+				sap_event_cb acs_event_callback,
 				tsap_config_t *pconfig,
 				void *pusr_context);
 

+ 2 - 3
core/sap/src/sap_fsm.c

@@ -1465,9 +1465,8 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
 	tSap_StationMICFailureEvent *mic_failure;
 
 	/* Format the Start BSS Complete event to return... */
-	if (!sap_ctx->pfnSapEventCallback) {
+	if (!sap_ctx->sap_event_cb)
 		return QDF_STATUS_E_FAILURE;
-	}
 
 	mac_ctx = sap_get_mac_context();
 	if (!mac_ctx) {
@@ -1863,7 +1862,7 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
 			  sap_hddevent);
 		break;
 	}
-	qdf_status = (*sap_ctx->pfnSapEventCallback)
+	qdf_status = (*sap_ctx->sap_event_cb)
 			(&sap_ap_event, sap_ctx->user_context);
 
 	return qdf_status;

+ 1 - 1
core/sap/src/sap_internal.h

@@ -142,7 +142,7 @@ struct sap_context {
 	uint32_t csr_roamId;
 
 	/* SAP event Callback to hdd */
-	tpWLAN_SAPEventCB pfnSapEventCallback;
+	sap_event_cb sap_event_cb;
 
 	/*
 	 * Include the state machine structure here, state var that keeps

+ 4 - 4
core/sap/src/sap_module.c

@@ -662,7 +662,7 @@ void wlan_sap_set_sap_ctx_acs_cfg(struct sap_context *sap_ctx,
 }
 
 QDF_STATUS wlansap_start_bss(struct sap_context *sap_ctx,
-			     tpWLAN_SAPEventCB pSapEventCallback,
+			     sap_event_cb sap_event_cb,
 			     tsap_config_t *config, void *user_context)
 {
 	tWLAN_SAPEvent sap_event;        /* State machine event */
@@ -758,7 +758,7 @@ QDF_STATUS wlansap_start_bss(struct sap_context *sap_ctx,
 	sap_event.params = 0;    /* pSapPhysLinkCreate */
 
 	/* Store the HDD callback in SAP context */
-	sap_ctx->pfnSapEventCallback = pSapEventCallback;
+	sap_ctx->sap_event_cb = sap_event_cb;
 
 	/* Handle event */
 	qdf_status = sap_fsm(sap_ctx, &sap_event);
@@ -2323,7 +2323,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac,
 }
 
 QDF_STATUS wlansap_acs_chselect(struct sap_context *sap_context,
-				tpWLAN_SAPEventCB pacs_event_callback,
+				sap_event_cb acs_event_callback,
 				tsap_config_t *pconfig,
 				void *pusr_context)
 {
@@ -2358,7 +2358,7 @@ QDF_STATUS wlansap_acs_chselect(struct sap_context *sap_context,
 	 * Copy the HDD callback function to report the
 	 * ACS result after scan in SAP context callback function.
 	 */
-	sap_context->pfnSapEventCallback = pacs_event_callback;
+	sap_context->sap_event_cb = acs_event_callback;
 	/*
 	 * init dfs channel nol
 	 */