wlan: Add ini support for indoor flags
The driver marked channel as PASSIVE irrespective of whether they were
marked indoor or not.
Provide support for having control over the same using ini param
gindoor_channel_support
Change-Id: I10c01e5da053be0ea08e58d97fbda2d1aef7ea59
CRs-Fixed: 2187462
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 3359bd4..e0a2d2d 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -1612,6 +1612,27 @@
/*
* <ini>
+ * gindoor_channel_support - Mark indoor channels as enabled or passive
+ * @Min: 0
+ * @Max: 1
+ * @Default: 0
+ *
+ * This ini is used to control the state of indoor channels. If the
+ * value is 1 then the indoor channels will be marked as enabled and
+ * if the value is 0 then the indoor channels will be marked as
+ * DFS
+ *
+ * The default value is 0
+ * </ini>
+ */
+#define CFG_INDOOR_CHANNEL_SUPPORT_NAME "gindoor_channel_support"
+#define CFG_INDOOR_CHANNEL_SUPPORT_MIN (0)
+#define CFG_INDOOR_CHANNEL_SUPPORT_MAX (1)
+#define CFG_INDOOR_CHANNEL_SUPPORT_DEFAULT (0)
+
+
+/*
+ * <ini>
* g_mark_indoor_as_disable - Enable/Disable Indoor channel
* @Min: 0
* @Max: 1
@@ -3819,6 +3840,7 @@
uint32_t btc_dyn_bt_len;
uint32_t btc_dyn_bt_ext_len;
uint32_t btc_dyn_num_bt_ext;
+ bool indoor_channel_support;
} hdd_config_t;
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h
index fdb566f..a0e0daa 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg80211.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h
@@ -1743,8 +1743,7 @@
*/
void hdd_modify_indoor_channel_state_flags(
struct ieee80211_channel *wiphy_chan,
- v_U32_t rfChannel,
- bool disable);
+ v_U32_t rfChannel, bool disable, hdd_context_t *hdd_ctx);
v_U8_t* wlan_hdd_cfg80211_get_ie_ptr(
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 160c3ee..c399b20 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3952,6 +3952,14 @@
CFG_STA_AUTH_RETRIES_FOR_CODE17_MIN,
CFG_STA_AUTH_RETRIES_FOR_CODE17_MAX ),
+ REG_VARIABLE( CFG_INDOOR_CHANNEL_SUPPORT_NAME, WLAN_PARAM_Integer,
+ hdd_config_t, indoor_channel_support,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_INDOOR_CHANNEL_SUPPORT_DEFAULT,
+ CFG_INDOOR_CHANNEL_SUPPORT_MIN,
+ CFG_INDOOR_CHANNEL_SUPPORT_MAX),
+
+
REG_VARIABLE( CFG_TRIGGER_NULLFRAME_BEFORE_HB_NAME, WLAN_PARAM_Integer,
hdd_config_t, trigger_nullframe_before_hb,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 80f6b46..771baf7 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -10554,13 +10554,14 @@
* @wiphy_chan: wiphy channel number
* @rfChannel: channel hw value
* @disable: Disable/enable the flags
+ * @hdd_ctx: The HDD context handler
*
* Modify wiphy flags and cds state if channel is indoor.
*
* Return: void
*/
void hdd_modify_indoor_channel_state_flags(struct ieee80211_channel *wiphy_chan,
- v_U32_t rfChannel, bool disable)
+ v_U32_t rfChannel, bool disable, hdd_context_t *hdd_ctx)
{
v_U32_t channelLoop;
eRfChannels channelEnum = INVALID_RF_CHANNEL;
@@ -10582,6 +10583,8 @@
IEEE80211_CHAN_DISABLED;
regChannels[channelEnum].enabled =
NV_CHANNEL_DISABLE;
+ hddLog(VOS_TRACE_LEVEL_INFO, "Channel: %d marked as DISABLE",
+ channelEnum);
}
} else {
if (wiphy_chan->flags & IEEE80211_CHAN_INDOOR_ONLY) {
@@ -10591,16 +10594,26 @@
* Indoor channels are marked as DFS
* during regulatory processing
*/
+ if ((wiphy_chan->flags & (IEEE80211_CHAN_RADAR |
+ IEEE80211_CHAN_PASSIVE_SCAN)) ||
+ ((hdd_ctx->cfg_ini->indoor_channel_support == false)
+ && (wiphy_chan->flags &
+ IEEE80211_CHAN_INDOOR_ONLY))) {
+ regChannels[channelEnum].enabled = NV_CHANNEL_DFS;
+ hddLog(VOS_TRACE_LEVEL_INFO, "Channel: %d marked as DFS",
+ channelEnum);
+ } else {
+ regChannels[channelEnum].enabled =
+ NV_CHANNEL_ENABLE;
+ hddLog(VOS_TRACE_LEVEL_INFO, "Channel: %d marked as ENABLE",
+ channelEnum);
+ }
+ }
- regChannels[channelEnum].enabled =
- NV_CHANNEL_DFS;
- }
- }
-
+ }
}
-void hdd_update_indoor_channel(hdd_context_t *hdd_ctx,
- bool disable)
+void hdd_update_indoor_channel(hdd_context_t *hdd_ctx, bool disable)
{
int band_num;
int chan_num;
@@ -10626,7 +10639,7 @@
rfChannel = wiphy->bands[band_num]->channels[chan_num].hw_value;
hdd_modify_indoor_channel_state_flags(wiphy_chan, rfChannel,
- disable);
+ disable, hdd_ctx);
}
}
EXIT();
diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index 2251e8a..97482e5 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -3722,24 +3722,33 @@
}
}
/* nv cannot distinguish between DFS and passive channels */
- else if (wiphy->bands[i]->channels[j].flags &
+ else if ((wiphy->bands[i]->channels[j].flags &
(IEEE80211_CHAN_RADAR | IEEE80211_CHAN_PASSIVE_SCAN |
- IEEE80211_CHAN_INDOOR_ONLY))
+ IEEE80211_CHAN_INDOOR_ONLY )))
{
- if (wiphy->bands[i]->channels[j].flags &
- IEEE80211_CHAN_INDOOR_ONLY)
+ if (pHddCtx->cfg_ini->indoor_channel_support == false &&
+ wiphy->bands[i]->channels[j].flags &
+ IEEE80211_CHAN_INDOOR_ONLY)
wiphy->bands[i]->channels[j].flags |=
IEEE80211_CHAN_PASSIVE_SCAN;
+
#ifdef FEATURE_WLAN_CH144
- if ((RF_CHAN_144 == k) && (E_NV_V3 != vos_nv_getNvVersion()))
- {
- //Do not enable channel 144 when NV version is not NV3
+ if ((RF_CHAN_144 == k) &&
+ (E_NV_V3 != vos_nv_getNvVersion())) {
+ //Do not enable channel 144 when NV version is not NV3
}
else
#endif
{
- pnvEFSTable->halnv.tables.regDomains[temp_reg_domain].\
- channels[k].enabled = NV_CHANNEL_DFS;
+ if ((pHddCtx->cfg_ini->indoor_channel_support == true &&
+ wiphy->bands[i]->channels[j].flags &
+ IEEE80211_CHAN_INDOOR_ONLY)) {
+ pnvEFSTable->halnv.tables.regDomains[temp_reg_domain].\
+ channels[k].enabled = NV_CHANNEL_ENABLE;
+ } else {
+ pnvEFSTable->halnv.tables.regDomains[temp_reg_domain].\
+ channels[k].enabled = NV_CHANNEL_DFS;
+ }
}
if (!gnvEFSTable->halnv.tables.regDomains[temp_reg_domain].channels[k].pwrLimit