Parcourir la source

qcacld-3.0: Rename sap_restart_chan_switch_cb()

Functions exported by HDD should have an HDD prefix so rename
sap_restart_chan_switch_cb() since it is exported by HDD.

Change-Id: I7b871774bb537e60e2992d471ab57b342246dd50
CRs-Fixed: 2122575
Jeff Johnson il y a 7 ans
Parent
commit
2381294829

+ 7 - 6
core/hdd/src/wlan_hdd_hostapd.c

@@ -2673,12 +2673,13 @@ void hdd_sap_restart_with_channel_switch(struct hdd_adapter *ap_adapter,
 	}
 }
 
-void sap_restart_chan_switch_cb (struct wlan_objmgr_psoc *psoc,
-				uint8_t vdev_id, uint32_t channel,
-				uint32_t channel_bw)
+void hdd_sap_restart_chan_switch_cb(struct wlan_objmgr_psoc *psoc,
+				    uint8_t vdev_id, uint32_t channel,
+				    uint32_t channel_bw)
 {
-	struct hdd_adapter *ap_adapter = wlan_hdd_get_adapter_from_vdev(
-					psoc, vdev_id);
+	struct hdd_adapter *ap_adapter =
+		wlan_hdd_get_adapter_from_vdev(psoc, vdev_id);
+
 	if (!ap_adapter) {
 		hdd_err("Adapter is NULL");
 		return;
@@ -2775,7 +2776,7 @@ QDF_STATUS wlan_hdd_get_channel_for_sap_restart(
 	*sec_ch = hdd_ap_ctx->sapConfig.sec_ch;
 
 	hdd_info("SAP channel change with CSA/ECSA");
-	sap_restart_chan_switch_cb(psoc, vdev_id,
+	hdd_sap_restart_chan_switch_cb(psoc, vdev_id,
 		hdd_ap_ctx->sapConfig.channel,
 		hdd_ap_ctx->sapConfig.ch_params.ch_width);
 

+ 7 - 5
core/hdd/src/wlan_hdd_hostapd.h

@@ -66,7 +66,7 @@ void hdd_sap_restart_with_channel_switch(struct hdd_adapter *adapter,
 				uint32_t target_channel,
 				uint32_t target_bw);
 /**
- * sap_restart_chan_switch_cb() - Function to restart SAP with
+ * hdd_sap_restart_chan_switch_cb() - Function to restart SAP with
  * a different channel
  * @psoc: PSOC object information
  * @vdev_id: vdev id
@@ -77,9 +77,9 @@ void hdd_sap_restart_with_channel_switch(struct hdd_adapter *adapter,
  * Return: None
  *
  */
-void sap_restart_chan_switch_cb (struct wlan_objmgr_psoc *psoc,
-				uint8_t vdev_id, uint32_t channel,
-				uint32_t channel_bw);
+void hdd_sap_restart_chan_switch_cb(struct wlan_objmgr_psoc *psoc,
+				    uint8_t vdev_id, uint32_t channel,
+				    uint32_t channel_bw);
 /**
  * wlan_hdd_get_channel_for_sap_restart() - Function to get
  * suitable channel and restart SAP
@@ -149,7 +149,9 @@ int wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
 
 int hdd_destroy_acs_timer(struct hdd_adapter *adapter);
 
-QDF_STATUS wlan_hdd_config_acs(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter);
+QDF_STATUS wlan_hdd_config_acs(struct hdd_context *hdd_ctx,
+			       struct hdd_adapter *adapter);
+
 void hdd_sap_indicate_disconnect_for_sta(struct hdd_adapter *adapter);
 void hdd_sap_destroy_events(struct hdd_adapter *adapter);
 #endif /* end #if !defined(WLAN_HDD_HOSTAPD_H) */

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

@@ -2172,7 +2172,7 @@ static void hdd_register_policy_manager_callback(
 	struct policy_mgr_hdd_cbacks hdd_cbacks;
 
 	hdd_cbacks.sap_restart_chan_switch_cb =
-		sap_restart_chan_switch_cb;
+		hdd_sap_restart_chan_switch_cb;
 	hdd_cbacks.wlan_hdd_get_channel_for_sap_restart =
 		wlan_hdd_get_channel_for_sap_restart;
 	hdd_cbacks.get_mode_for_non_connected_vdev =