[WCNCR00155320] misc: fix mt7638 5g band is not correctly configured issue
[Description]
Fix 5g band in wiphy is not correctly configured issue
when single band mt7638 is used.
Change-Id: I4b2c8abdb23a4f99f6aac6d6009f4cc3530fd7f3
Signed-off-by: Glenn Tung <glenn.tung@mediatek.com>
CR-Id: WCNCR00155320
Feature: misc
Reviewed-on: http://gerrit.mediatek.inc:8080/1309430
CheckPatch: Check Patch <srv_checkpatch@mediatek.com>
Reviewed-by: George Kuo <george.kuo@mediatek.com>
Reviewed-by: Sarick Jiang <sarick.jiang@mediatek.com>
Build: srv_neptune_adm <srv_neptune_adm@mediatek.com>
Test: srv_neptune_adm <srv_neptune_adm@mediatek.com>
diff --git a/os/linux/gl_init.c b/os/linux/gl_init.c
index bbc7c0f..f0d4d98 100644
--- a/os/linux/gl_init.c
+++ b/os/linux/gl_init.c
@@ -2223,6 +2223,7 @@
INT_32 i4Status = 0;
BOOL bRet = FALSE;
P_REG_INFO_T prRegInfo;
+ UINT_8 i = 0;
#if (MTK_WCN_HIF_SDIO && CFG_WMT_WIFI_PATH_SUPPORT)
INT_32 i4RetVal = 0;
#endif
@@ -2391,10 +2392,6 @@
prGlueInfo->prAdapter->rWifiVar.ucThreadScheduling);
}
- /* Disable 5G band for AIS */
- if (prAdapter->fgEnable5GBand == FALSE)
- prWdev->wiphy->bands[KAL_BAND_5GHZ] = NULL;
-
g_u4HaltFlag = 0;
#if CFG_SUPPORT_BUFFER_MODE
@@ -2509,6 +2506,23 @@
#endif
} while (FALSE);
+ /* Configure 5G band for registered wiphy */
+ if (prAdapter->fgEnable5GBand)
+ prWdev->wiphy->bands[KAL_BAND_5GHZ] = &mtk_band_5ghz;
+ else
+ prWdev->wiphy->bands[KAL_BAND_5GHZ] = NULL;
+
+ for (i = 0 ; i < KAL_P2P_NUM; i++) {
+ if (gprP2pRoleWdev[i] == NULL)
+ continue;
+
+ if (prAdapter->fgEnable5GBand)
+ gprP2pRoleWdev[i]->wiphy->bands[KAL_BAND_5GHZ] =
+ &mtk_band_5ghz;
+ else
+ gprP2pRoleWdev[i]->wiphy->bands[KAL_BAND_5GHZ] = NULL;
+ }
+
if (i4Status == 0) {
#if CFG_SUPPORT_AGPS_ASSIST
kalIndicateAgpsNotify(prAdapter, AGPS_EVENT_WLAN_ON, NULL, 0);
