wlan: set appropriate flags for wiphy device based on current regdomain
When the driver loads and sets up the regulatory domain make sure that
the static channel list populated in the wiphy device has correct flags
set so that the supplicant does not end up trying to use channels which
are not supported due to h/w limitations or limitations enforced by the
driver configuration or regulatory domain limitations.
CRs-Fixed: 459244
Change-Id: I2930561d0cfde574b70789bb31eea458b56a3086
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index cea4a11..68d8493 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -534,21 +534,59 @@
*/
int wlan_hdd_cfg80211_update_band(struct wiphy *wiphy, eCsrBand eBand)
{
+ int i, j;
+ eNVChannelEnabledType channelEnabledState;
+
ENTER();
- switch(eBand)
+ for (i = 0; i < IEEE80211_NUM_BANDS; i++)
{
- case eCSR_BAND_24:
- wiphy->bands[IEEE80211_BAND_2GHZ] = &wlan_hdd_band_2_4_GHZ;
- wiphy->bands[IEEE80211_BAND_5GHZ] = NULL;
- break;
- case eCSR_BAND_5G:
- wiphy->bands[IEEE80211_BAND_2GHZ] = &wlan_hdd_band_p2p_2_4_GHZ;
- wiphy->bands[IEEE80211_BAND_5GHZ] = &wlan_hdd_band_5_GHZ;
- break;
- case eCSR_BAND_ALL:
- default:
- wiphy->bands[IEEE80211_BAND_2GHZ] = &wlan_hdd_band_2_4_GHZ;
- wiphy->bands[IEEE80211_BAND_5GHZ] = &wlan_hdd_band_5_GHZ;
+
+ if (NULL == wiphy->bands[i])
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,"%s: wiphy->bands[i] is NULL, i = %d",
+ __func__, i);
+ continue;
+ }
+
+ for (j = 0; j < wiphy->bands[i]->n_channels; j++)
+ {
+ struct ieee80211_supported_band *band = wiphy->bands[i];
+
+ channelEnabledState = vos_nv_getChannelEnabledState(
+ band->channels[j].hw_value);
+
+ if (IEEE80211_BAND_2GHZ == i && eCSR_BAND_5G == eBand) // 5G only
+ {
+ // Enable Social channels for P2P
+ if (WLAN_HDD_IS_SOCIAL_CHANNEL(band->channels[j].center_freq) &&
+ NV_CHANNEL_ENABLE == channelEnabledState)
+ band->channels[j].flags &= ~IEEE80211_CHAN_DISABLED;
+ else
+ band->channels[j].flags |= IEEE80211_CHAN_DISABLED;
+ continue;
+ }
+ else if (IEEE80211_BAND_5GHZ == i && eCSR_BAND_24 == eBand) // 2G only
+ {
+ band->channels[j].flags |= IEEE80211_CHAN_DISABLED;
+ continue;
+ }
+
+ if (NV_CHANNEL_DISABLE == channelEnabledState ||
+ NV_CHANNEL_INVALID == channelEnabledState)
+ {
+ band->channels[j].flags |= IEEE80211_CHAN_DISABLED;
+ }
+ else if (NV_CHANNEL_DFS == channelEnabledState)
+ {
+ band->channels[j].flags &= ~IEEE80211_CHAN_DISABLED;
+ band->channels[j].flags |= IEEE80211_CHAN_RADAR;
+ }
+ else
+ {
+ band->channels[j].flags &= ~(IEEE80211_CHAN_DISABLED
+ |IEEE80211_CHAN_RADAR);
+ }
+ }
}
return 0;
}
@@ -563,6 +601,9 @@
hdd_config_t *pCfg
)
{
+
+ int i, j;
+
ENTER();
/* Now bind the underlying wlan device with wiphy */
@@ -652,20 +693,38 @@
wlan_hdd_band_5_GHZ.ht_cap.cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
}
- /*Initialize band capability*/
- switch(pCfg->nBandCapability)
- {
- case eCSR_BAND_24:
- wiphy->bands[IEEE80211_BAND_2GHZ] = &wlan_hdd_band_2_4_GHZ;
- break;
- case eCSR_BAND_5G:
- wiphy->bands[IEEE80211_BAND_2GHZ] = &wlan_hdd_band_p2p_2_4_GHZ;
- wiphy->bands[IEEE80211_BAND_5GHZ] = &wlan_hdd_band_5_GHZ;
- break;
- case eCSR_BAND_ALL:
- default:
- wiphy->bands[IEEE80211_BAND_2GHZ] = &wlan_hdd_band_2_4_GHZ;
- wiphy->bands[IEEE80211_BAND_5GHZ] = &wlan_hdd_band_5_GHZ;
+ wiphy->bands[IEEE80211_BAND_2GHZ] = &wlan_hdd_band_2_4_GHZ;
+ wiphy->bands[IEEE80211_BAND_5GHZ] = &wlan_hdd_band_5_GHZ;
+
+ for (i = 0; i < IEEE80211_NUM_BANDS; i++)
+ {
+
+ if (NULL == wiphy->bands[i])
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,"%s: wiphy->bands[i] is NULL, i = %d",
+ __func__, i);
+ continue;
+ }
+
+ for (j = 0; j < wiphy->bands[i]->n_channels; j++)
+ {
+ struct ieee80211_supported_band *band = wiphy->bands[i];
+
+ if (IEEE80211_BAND_2GHZ == i && eCSR_BAND_5G == pCfg->nBandCapability) // 5G only
+ {
+ // Enable social channels for P2P
+ if (WLAN_HDD_IS_SOCIAL_CHANNEL(band->channels[j].center_freq))
+ band->channels[j].flags &= ~IEEE80211_CHAN_DISABLED;
+ else
+ band->channels[j].flags |= IEEE80211_CHAN_DISABLED;
+ continue;
+ }
+ else if (IEEE80211_BAND_5GHZ == i && eCSR_BAND_24 == pCfg->nBandCapability) // 2G only
+ {
+ band->channels[j].flags |= IEEE80211_CHAN_DISABLED;
+ continue;
+ }
+ }
}
/*Initialise the supported cipher suite details*/
wiphy->cipher_suites = hdd_cipher_suites;