wlan: Free cached channel list with restore channels
When driver receives the command to disable the channels
it maintains a list of the channels which are disabled.
During SAP stop, driver restores the disabled channels
but it is not freeing the cache list. Now when again the
command is issued to disable the channels, driver is not
processing this command as it still has the channels in its
cached list which were disabled during previous command.
This results into failure of current command and all the
subsequent commands to disable the channels until the
cache list is not cleared with set_disable_channel_list
command with empty channel list.
To address above issue, clear the cache channel list
as soon as driver restores the channels on stop bss.
Change-Id: I6b8c7ba250ef38b892ab83621add45fbfc09a2cd
CRs-fixed: 2712499
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index ac36d11..b1afd38 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -2392,4 +2392,12 @@
*/
bool hdd_is_cli_iface_up(hdd_context_t *hdd_ctx);
+/**
+ * wlan_hdd_free_cache_channels() - Free the cache channels list
+ * @hdd_ctx: Pointer to HDD context
+ *
+ * Return: None
+ */
+void wlan_hdd_free_cache_channels(hdd_context_t *hdd_ctx);
+
#endif // end #if !defined( WLAN_HDD_MAIN_H )
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 5cdbaba..1640fb6 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -11069,6 +11069,12 @@
status = sme_update_channel_list((tpAniSirGlobal)hdd_ctx->hHal);
if (status)
hddLog(VOS_TRACE_LEVEL_ERROR, "Can't Restore channel list");
+ else
+ /*
+ * Free the cache channels when the
+ * disabled channels are restored
+ */
+ wlan_hdd_free_cache_channels(hdd_ctx);
EXIT();
return 0;
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 15ac7dc..c0e6193 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -3614,14 +3614,7 @@
}
#endif
-/**
- * wlan_hdd_free_cache_channels() - Free the cache channels list
- * @hdd_ctx: Pointer to HDD context
- *
- * Return: None
- */
-
-static void wlan_hdd_free_cache_channels(hdd_context_t *hdd_ctx)
+void wlan_hdd_free_cache_channels(hdd_context_t *hdd_ctx)
{
if(!hdd_ctx || !hdd_ctx->original_channels)
return;
@@ -3729,13 +3722,11 @@
__func__, tempInt);
if (!tempInt) {
- if (!wlan_hdd_restore_channels(hdd_ctx)) {
- /*
- * Free the cache channels only when the command is
- * received with num channels as 0
- */
- wlan_hdd_free_cache_channels(hdd_ctx);
- }
+ /*
+ * Restore and Free the cache channels when the command is
+ * received with num channels as 0
+ */
+ wlan_hdd_restore_channels(hdd_ctx);
return 0;
}