wlan: Update right hardware capability in initialization
During initialization driver updates support for both 2.4GHz and
5GHz support irrespective of the hardware capability. Due to
which user sees wrong capability indicated when 'iw phy' command
is run.
Update right capability during cfg80211 initialization.
Change-Id: Id817f604ccb7c25200bcf58972eae6e9e01934e4
CRs-Fixed: 619678
(cherry picked from commit c278e7bf46a0a23babbe2e8547fcc5f74aedddb8)
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 3e84cde..0339d25 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -1389,4 +1389,6 @@
#endif /*End of FEATURE_WLAN_BATCH_SCAN*/
+boolean hdd_is_5g_supported(hdd_context_t * pHddCtx);
+
#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 2b8b6d8..f83b494 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -701,6 +701,8 @@
)
{
int i, j;
+ hdd_context_t *pHddCtx = wiphy_priv(wiphy);
+
ENTER();
/* Now bind the underlying wlan device with wiphy */
@@ -814,7 +816,10 @@
}
wiphy->bands[IEEE80211_BAND_2GHZ] = &wlan_hdd_band_2_4_GHZ;
- wiphy->bands[IEEE80211_BAND_5GHZ] = &wlan_hdd_band_5_GHZ;
+ if (true == hdd_is_5g_supported(pHddCtx))
+ {
+ wiphy->bands[IEEE80211_BAND_5GHZ] = &wlan_hdd_band_5_GHZ;
+ }
for (i = 0; i < IEEE80211_NUM_BANDS; i++)
{
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index d9184e1..f3c578c 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -7755,7 +7755,7 @@
\return - true if hardware supports 5GHz
--------------------------------------------------------------------------*/
-static boolean hdd_is_5g_supported(hdd_context_t * pHddCtx)
+boolean hdd_is_5g_supported(hdd_context_t * pHddCtx)
{
/* If wcnss_wlan_iris_xo_mode() returns WCNSS_XO_48MHZ(1);
* then hardware support 5Ghz.