Revert "[nrf noup] net: l2: wifi: Configure BSS max idle period"

This reverts commit 691b66e.

Signed-off-by: Robert Lubos <[email protected]>

Author: rlubos

drivers/wifi/nrf_wifi/inc/fmac_main.h

@@ -91,7 +91,6 @@ struct nrf_wifi_vif_ctx_zep {
 	struct k_work_delayable nrf_wifi_rpu_recovery_bringup_work;
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 	int rts_threshold_value;
-	unsigned short bss_max_idle_period;
 };
 
 struct nrf_wifi_vif_ctx_map {

drivers/wifi/nrf_wifi/inc/wifi_mgmt.h

@@ -77,7 +77,4 @@ int nrf_wifi_set_rts_threshold(const struct device *dev,
 
 int nrf_wifi_get_rts_threshold(const struct device *dev,
 			       unsigned int *rts_threshold);
-
-int nrf_wifi_set_bss_max_idle_period(const struct device *dev,
-				     unsigned short bss_max_idle_period);
 #endif /*  __ZEPHYR_WIFI_MGMT_H__ */

drivers/wifi/nrf_wifi/src/fmac_main.c

@@ -858,9 +858,6 @@ static int nrf_wifi_drv_main_zep(const struct device *dev)
 #endif /* CONFIG_NRF70_RADIO_TEST */
 
 	k_mutex_init(&rpu_drv_priv_zep.rpu_ctx_zep.rpu_lock);
-#ifndef CONFIG_NRF70_RADIO_TEST
-	vif_ctx_zep->bss_max_idle_period = USHRT_MAX;
-#endif /* !CONFIG_NRF70_RADIO_TEST */
 	return 0;
 #ifdef CONFIG_NRF70_RADIO_TEST
 fmac_deinit:
@@ -888,7 +885,6 @@ static const struct wifi_mgmt_ops nrf_wifi_mgmt_ops = {
 	.get_power_save_config = nrf_wifi_get_power_save_config,
 	.set_rts_threshold = nrf_wifi_set_rts_threshold,
 	.get_rts_threshold = nrf_wifi_get_rts_threshold,
-	.set_bss_max_idle_period = nrf_wifi_set_bss_max_idle_period,
 #endif
 #ifdef CONFIG_NRF70_SYSTEM_WITH_RAW_MODES
 	.mode = nrf_wifi_mode,

drivers/wifi/nrf_wifi/src/wifi_mgmt.c

@@ -1077,56 +1077,3 @@ int nrf_wifi_get_rts_threshold(const struct device *dev,
 
 	return ret;
 }
-
-int nrf_wifi_set_bss_max_idle_period(const struct device *dev,
-				     unsigned short bss_max_idle_period)
-{
-	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
-	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
-	int ret = -1;
-
-	if (!dev) {
-		LOG_ERR("%s: dev is NULL", __func__);
-		return ret;
-	}
-
-	vif_ctx_zep = dev->data;
-
-	if (!vif_ctx_zep) {
-		LOG_ERR("%s: vif_ctx_zep is NULL", __func__);
-		return ret;
-	}
-
-	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
-
-	if (!rpu_ctx_zep) {
-		LOG_ERR("%s: rpu_ctx_zep is NULL", __func__);
-		return ret;
-	}
-
-
-	if (!rpu_ctx_zep->rpu_ctx) {
-		LOG_ERR("%s: RPU context not initialized", __func__);
-		return ret;
-	}
-
-	if (((int)bss_max_idle_period < 0) ||
-	    (bss_max_idle_period > 64000)) {
-		/* 0 or value less than 64000 is passed to f/w.
-		 * All other values considered as invalid.
-		 */
-		LOG_ERR("%s: Invalid max_idle_period value : %d",
-			__func__, (int)bss_max_idle_period);
-		return ret;
-	}
-
-	k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER);
-
-	vif_ctx_zep->bss_max_idle_period = bss_max_idle_period;
-
-	ret = 0;
-
-	k_mutex_unlock(&vif_ctx_zep->vif_lock);
-
-	return ret;
-}

drivers/wifi/nrf_wifi/src/wpa_supp_if.c

@@ -931,10 +931,8 @@ int nrf_wifi_wpa_supp_associate(void *if_priv, struct wpa_driver_associate_param
 		assoc_info.use_mfp = NRF_WIFI_MFP_REQUIRED;
 	}
 
-	if (vif_ctx_zep->bss_max_idle_period == USHRT_MAX) {
-		assoc_info.bss_max_idle_time = CONFIG_WIFI_MGMT_BSS_MAX_IDLE_TIME;
-	} else {
-		assoc_info.bss_max_idle_time = vif_ctx_zep->bss_max_idle_period;
+	if (params->bss_max_idle_period) {
+		assoc_info.bss_max_idle_time = params->bss_max_idle_period;
 	}
 
 	assoc_info.conn_type = NRF_WIFI_CONN_TYPE_OPEN;

include/zephyr/net/wifi_mgmt.h

@@ -133,8 +133,6 @@ enum net_request_wifi_cmd {
 	NET_REQUEST_WIFI_CMD_CANDIDATE_SCAN,
 	/** AP WPS config */
 	NET_REQUEST_WIFI_CMD_AP_WPS_CONFIG,
-	/** Configure BSS maximum idle period */
-	NET_REQUEST_WIFI_CMD_BSS_MAX_IDLE_PERIOD,
 	/** @cond INTERNAL_HIDDEN */
 	NET_REQUEST_WIFI_CMD_MAX
 	/** @endcond */
@@ -319,11 +317,6 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_START_ROAMING);
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_NEIGHBOR_REP_COMPLETE);
 
-#define NET_REQUEST_WIFI_BSS_MAX_IDLE_PERIOD				\
-	(NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_BSS_MAX_IDLE_PERIOD)
-
-NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_BSS_MAX_IDLE_PERIOD);
-
 /** @brief Wi-Fi management events */
 enum net_event_wifi_cmd {
 	/** Scan results available */
@@ -1566,15 +1559,6 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*start_11r_roaming)(const struct device *dev);
-	/** Set BSS max idle period
-	 *
-	 * @param dev Pointer to the device structure for the driver instance.
-	 * @param BSS max idle period value
-	 *
-	 * @return 0 if ok, < 0 if error
-	 */
-	int (*set_bss_max_idle_period)(const struct device *dev,
-			unsigned short bss_max_idle_period);
 };
 
 /** Wi-Fi management offload API */

modules/hostap/src/supp_api.c

@@ -1811,19 +1811,6 @@ int supplicant_legacy_roam(const struct device *dev)
 	return ret;
 }
 
-int supplicant_set_bss_max_idle_period(const struct device *dev,
-				       unsigned short bss_max_idle_period)
-{
-	const struct wifi_mgmt_ops *const wifi_mgmt_api = get_wifi_mgmt_api(dev);
-
-	if (!wifi_mgmt_api || !wifi_mgmt_api->set_bss_max_idle_period) {
-		wpa_printf(MSG_ERROR, "set_bss_max_idle_period is not supported");
-		return -ENOTSUP;
-	}
-
-	return wifi_mgmt_api->set_bss_max_idle_period(dev, bss_max_idle_period);
-}
-
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
 int supplicant_btm_query(const struct device *dev, uint8_t reason)
 {

modules/hostap/src/supp_api.h

@@ -305,14 +305,6 @@ int supplicant_get_wifi_conn_params(const struct device *dev,
  */
 int supplicant_wps_config(const struct device *dev, struct wifi_wps_config_params *params);
 
-/** @ Set Wi-Fi max idle period
- *
- * @param dev Wi-Fi interface handle to use
- * @param bss_max_idle_period Maximum idle period to set
- * @return 0 for OK; -1 for ERROR
- */
-int supplicant_set_bss_max_idle_period(const struct device *dev,
-				       unsigned short bss_max_idle_period);
 #ifdef CONFIG_AP
 int set_ap_bandwidth(const struct device *dev, enum wifi_frequency_bandwidths bandwidth);
 

modules/hostap/src/supp_main.c

@@ -83,7 +83,6 @@ static const struct wifi_mgmt_ops mgmt_ops = {
 #endif
 	.get_conn_params = supplicant_get_wifi_conn_params,
 	.wps_config = supplicant_wps_config,
-	.set_bss_max_idle_period = supplicant_set_bss_max_idle_period,
 #ifdef CONFIG_AP
 	.ap_enable = supplicant_ap_enable,
 	.ap_disable = supplicant_ap_disable,

subsys/net/l2/wifi/Kconfig

@@ -154,19 +154,3 @@ config HEAP_MEM_POOL_ADD_SIZE_WIFI_CERT
 endif # WIFI_SHELL_RUNTIME_CERTIFICATES
 
 endif # WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
-
-config WIFI_MGMT_BSS_MAX_IDLE_TIME
-	int "BSS max idle timeout in seconds"
-	range 0 64000
-	default 30
-	help
-	  As per 802.11-2020: 11.21.13 BSS max idle period management
-	  If dot11WirelessManagementImplemented is true, dot11BSSMaxIdlePeriod is
-	  nonzero and dot11BSSMaxIdlePeriodIndicationByNonAPSTA is true, then a
-	  non-S1G non-AP STA shall include a BSS Max Idle Period element
-	  in the (Re)Association Request frame. If the BSS Max Idle Period
-	  element is present in the (Re)Association Request frame received
-	  by a non-S1G AP that has dot11BSSMaxIdlePeriodIndicationByNonAPSTA
-	  equal to true, then the non-S1G AP may choose the non-AP STA’s
-	  preferred maximum idle period. The non-S1G AP indicates its chosen
-	  value to the non-S1G STA in the (Re)Association Response frame.