wlan: Update set disable channel list command implementation
Currently driver disables channels received in
SET_DISABLE_CHANNEL_LIST command, only when sap
is turned on (on start bss). According to new requirement,
channels should be disabled as soon as the command is received.
To meet above expectation update the set disable channel list
command functionality to disable the channels as soon as the
command is received.
Change-Id: I596c21847e90efef9676f20df528aed77e927519
CRs-fixed: 2413505
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h
index 617d5bb..bbd92df 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg80211.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h
@@ -1733,6 +1733,29 @@
int wlan_hdd_restore_channels(hdd_context_t *pHddCtx);
/*
+ * wlan_hdd_disable_channels() - Cache the the channels
+ * and current state of the channels from the channel list
+ * received in the command and disable the channels on the
+ * wiphy and NV table.
+ * @hdd_ctx: Pointer to hdd context
+ *
+ * @return: 0 on success, Error code on failure
+ */
+int wlan_hdd_disable_channels(hdd_context_t *hdd_ctx);
+
+/*
+ * hdd_check_and_disconnect_sta_on_invalid_channel() - Disconnect STA if it is
+ * on indoor channel
+ * @hdd_ctx: pointer to hdd context
+ *
+ * STA should be disconnected before starting the SAP if it is on indoor
+ * channel.
+ *
+ * Return: void
+ */
+void hdd_check_and_disconnect_sta_on_invalid_channel(hdd_context_t *hdd_ctx);
+
+/*
* hdd_update_indoor_channel() - enable/disable indoor channel
* @hdd_ctx: hdd context
* @disable: whether to enable / disable indoor channel
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 5155721..80fadbb 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -10760,16 +10760,6 @@
return result;
}
-/*
- * hdd_check_and_disconnect_sta_on_invalid_channel() - Disconnect STA if it is
- * on indoor channel
- * @hdd_ctx: pointer to hdd context
- *
- * STA should be disconnected before starting the SAP if it is on indoor
- * channel.
- *
- * Return: void
- */
void hdd_check_and_disconnect_sta_on_invalid_channel(hdd_context_t *hdd_ctx)
{
@@ -10859,6 +10849,13 @@
wiphy_channel->flags =
cache_chann->
channel_info[i].wiphy_status;
+ hddLog(VOS_TRACE_LEVEL_DEBUG,
+ "Restore channel %d reg_stat %d wiphy_stat 0x%x",
+ cache_chann->
+ channel_info[i].channel_num,
+ cache_chann->
+ channel_info[i].reg_status,
+ wiphy_channel->flags);
break;
}
}
@@ -10877,17 +10874,7 @@
return 0;
}
-/*
- * wlan_hdd_disable_channels() - Cache the the channels
- * and current state of the channels from the channel list
- * received in the command and disable the channels on the
- * wiphy and NV table.
- * @hdd_ctx: Pointer to hdd context
- *
- * @return: 0 on success, Error code on failure
- */
-
-static int wlan_hdd_disable_channels(hdd_context_t *hdd_ctx)
+int wlan_hdd_disable_channels(hdd_context_t *hdd_ctx)
{
struct hdd_cache_channels *cache_chann;
struct wiphy *wiphy;
@@ -11052,12 +11039,6 @@
hdd_check_and_disconnect_sta_on_invalid_channel(pHddCtx);
}
- if (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP) {
- /* Disable the channels received in command SET_DISABLE_CHANNEL_LIST*/
- wlan_hdd_disable_channels(pHddCtx);
- hdd_check_and_disconnect_sta_on_invalid_channel(pHddCtx);
- }
-
pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pHostapdAdapter);
pConfig = &pHostapdAdapter->sessionCtx.ap.sapConfig;
@@ -11656,8 +11637,6 @@
return 0;
error:
- if (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP)
- wlan_hdd_restore_channels(pHddCtx);
/* Revert the indoor to passive marking if START BSS fails */
if (iniConfig->disable_indoor_channel &&
pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP) {
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index bb3bcd8..7117aaa 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -3835,6 +3835,12 @@
mem_alloc_failed:
mutex_unlock(&hdd_ctx->cache_channel_lock);
+ /* Disable the channels received in command SET_DISABLE_CHANNEL_LIST*/
+ if (!is_command_repeated) {
+ wlan_hdd_disable_channels(hdd_ctx);
+ hdd_check_and_disconnect_sta_on_invalid_channel(hdd_ctx);
+ }
+
EXIT();
return ret;