[nrf fromtree] modules: hostap: Use per-interface control connection

For hostapd also use per-interface control connection like we do for
supplicant.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit b29dddf)

Author: krish2718

modules/hostap/src/hapd_api.c

@@ -38,7 +38,7 @@ static struct wifi_enterprise_creds_params hapd_enterprise_creds;
 #define hostapd_cli_cmd_v(cmd, ...) ({					\
 	bool status;							\
 									\
-	if (zephyr_hostapd_cli_cmd_v(cmd, ##__VA_ARGS__) < 0) {		\
+	if (zephyr_hostapd_cli_cmd_v(iface->ctrl_conn, cmd, ##__VA_ARGS__) < 0) {		\
 		wpa_printf(MSG_ERROR,					\
 			   "Failed to execute wpa_cli command: %s",	\
 			   cmd);					\
@@ -365,12 +365,22 @@ int hostapd_add_enterprise_creds(const struct device *dev,
 }
 #endif
 
-bool hostapd_ap_reg_domain(struct wifi_reg_domain *reg_domain)
+bool hostapd_ap_reg_domain(const struct device *dev,
+	struct wifi_reg_domain *reg_domain)
 {
-	return hostapd_cli_cmd_v("set country_code %s", reg_domain->country_code);
+	struct hostapd_iface *iface;
+
+	iface = get_hostapd_handle(dev);
+	if (iface == NULL) {
+		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
+		return false;
+	}
+
+	return hostapd_cli_cmd_v(iface->ctrl_conn, "set country_code %s", reg_domain->country_code);
 }
 
-static int hapd_config_chan_center_seg0(struct wifi_connect_req_params *params)
+static int hapd_config_chan_center_seg0(struct hostapd_iface *iface,
+	struct wifi_connect_req_params *params)
 {
 	int ret = 0;
 	uint8_t center_freq_seg0_idx = 0;
@@ -472,7 +482,7 @@ int hapd_config_network(struct hostapd_iface *iface,
 		goto out;
 	}
 
-	ret = hapd_config_chan_center_seg0(params);
+	ret = hapd_config_chan_center_seg0(iface, params);
 	if (ret) {
 		goto out;
 	}

modules/hostap/src/hapd_api.h

@@ -25,9 +25,11 @@ int hostapd_ap_config_params(const struct device *dev, struct wifi_ap_config_par
  * @brief Set Wi-Fi AP region domain
  *
  * @param reg_domain region domain parameters
+ * @param dev Wi-Fi device
  * @return true for OK; false for ERROR
  */
-bool hostapd_ap_reg_domain(struct wifi_reg_domain *reg_domain);
+bool hostapd_ap_reg_domain(const struct device *dev,
+	struct wifi_reg_domain *reg_domain);
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_WPS
 /** Start AP WPS PBC/PIN

modules/hostap/src/supp_api.c

@@ -1749,7 +1749,7 @@ int supplicant_reg_domain(const struct device *dev,
 		}
 
 		if (IS_ENABLED(CONFIG_WIFI_NM_HOSTAPD_AP)) {
-			if (!hostapd_ap_reg_domain(reg_domain)) {
+			if (!hostapd_ap_reg_domain(dev, reg_domain)) {
 				goto out;
 			}
 		}