P2P: Allow P2P GO to start on social channels when BAND is set to 5GHz
During P2P group formation, P2P GO may start group on any of social
channel. If BAND is set as 5GHz, start of BSS will fail on social
channel leading to group formation failure.
As P2P functions on social channels along with 5GHz channels, allow
setting any of social channel as operating channel of BSS.
Change-Id: Ic64a0aab75300ba6af6431c9e46e5186640811f2
CRs-Fixed: 642232
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 85739de..84520db 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -1705,13 +1705,42 @@
}
}
- if (indx >= num_ch)
- {
- hddLog(VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid Channel [%d]", __func__, channel);
- return VOS_STATUS_E_FAILURE;
- }
+ if (indx >= num_ch)
+ {
+ if (WLAN_HDD_P2P_GO == pAdapter->device_mode)
+ {
+ eCsrBand band;
+ unsigned int freq;
+
+ sme_GetFreqBand(hHal, &band);
+
+ if (eCSR_BAND_5G == band)
+ {
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38))
+ if (channel <= ARRAY_SIZE(hdd_channels_2_4_GHZ))
+ {
+ freq = ieee80211_channel_to_frequency(channel,
+ IEEE80211_BAND_2GHZ);
+ }
+ else
+ {
+ freq = ieee80211_channel_to_frequency(channel,
+ IEEE80211_BAND_5GHZ);
+ }
+#else
+ freq = ieee80211_channel_to_frequency(channel);
+#endif
+ if(WLAN_HDD_IS_SOCIAL_CHANNEL(freq))
+ return VOS_STATUS_SUCCESS;
+ }
+ }
+
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ "%s: Invalid Channel [%d]", __func__, channel);
+ return VOS_STATUS_E_FAILURE;
+ }
}
+
return VOS_STATUS_SUCCESS;
}
@@ -2200,7 +2229,7 @@
{
pConfig->SapHw_mode = eSAP_DOT11_MODE_11ac;
- /* Disable VHT support in 2.4 GHz band */
+ /* Disable VHT support in 2.4 GHz and */
if (pConfig->channel <= 14 &&
(WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->enableVhtFor24GHzBand == FALSE)
{