Commit dbadffc9 authored by DidntRead's avatar DidntRead
Browse files

report a correct channel list

parent b1075c75

drivers/misc/mediatek/connectivity/wlan/gen3/common/wlan_bow.c

+2 −2
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ WLAN_STATUS bowCmdGetMacStatus(IN P_ADAPTER_T prAdapter, IN P_AMPC_COMMAND prCmd 
		DBGLOG(BOW, EVENT,

		       "bowCmdGetMacStatus, Get channel list. Current number of channel, %d.\n", ucNumOfChannel);



		rlmDomainGetChnlList(prAdapter, BAND_2G4, MAX_BOW_NUMBER_OF_CHANNEL_2G4,

		rlmDomainGetChnlList(prAdapter, BAND_2G4, false, MAX_BOW_NUMBER_OF_CHANNEL_2G4,

				     &ucNumOfChannel, aucChannelList);



		if (ucNumOfChannel > 0) {
@@ -600,7 +600,7 @@ WLAN_STATUS bowCmdGetMacStatus(IN P_ADAPTER_T prAdapter, IN P_AMPC_COMMAND prCmd 
			prMacStatus->ucNumOfChannel = ucNumOfChannel;

		}



		rlmDomainGetChnlList(prAdapter, BAND_5G, MAX_BOW_NUMBER_OF_CHANNEL_5G, &ucNumOfChannel, aucChannelList);

		rlmDomainGetChnlList(prAdapter, BAND_5G, false,  MAX_BOW_NUMBER_OF_CHANNEL_5G, &ucNumOfChannel, aucChannelList);



		if (ucNumOfChannel > 0) {

			for (idx = 0; idx < ucNumOfChannel /*MAX_BOW_NUMBER_OF_CHANNEL_5G */;

drivers/misc/mediatek/connectivity/wlan/gen3/include/mgmt/rlm_domain.h

+6 −2
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ typedef struct _DOMAIN_SUBBAND_INFO { 
	UINT_8 ucChannelSpan;	/* Type: ENUM_CHNL_SPAN_T */

	UINT_8 ucFirstChannelNum;

	UINT_8 ucNumChannels;

	UINT_8 ucReserved;	/* Type: BOOLEAN (fgDfsNeeded) */

	UINT_8 fgDfs;	/* Type: BOOLEAN (fgDfsNeeded) */

} DOMAIN_SUBBAND_INFO, *P_DOMAIN_SUBBAND_INFO;



/* Use it as all available channel list for STA */
@@ -590,7 +590,11 @@ P_DOMAIN_INFO_ENTRY rlmDomainGetDomainInfo(P_ADAPTER_T prAdapter); 


VOID

rlmDomainGetChnlList(P_ADAPTER_T prAdapter,

		     ENUM_BAND_T eSpecificBand,

		     ENUM_BAND_T eSpecificBand, BOOLEAN fgNoDfs,

		     UINT_8 ucMaxChannelNum, PUINT_8 pucNumOfChannel, P_RF_CHANNEL_INFO_T paucChannelList);



VOID

rlmDomainGetDfsChnls(P_ADAPTER_T prAdapter,

			  UINT_8 ucMaxChannelNum, PUINT_8 pucNumOfChannel, P_RF_CHANNEL_INFO_T paucChannelList);



VOID rlmDomainSendCmd(P_ADAPTER_T prAdapter, BOOLEAN fgIsOid);

drivers/misc/mediatek/connectivity/wlan/gen3/mgmt/rlm_domain.c

+53 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ P_DOMAIN_INFO_ENTRY rlmDomainGetDomainInfo(P_ADAPTER_T prAdapter) 
/*----------------------------------------------------------------------------*/

VOID

rlmDomainGetChnlList(P_ADAPTER_T prAdapter,

		     ENUM_BAND_T eSpecificBand,

		     ENUM_BAND_T eSpecificBand, BOOLEAN fgNoDfs,

		     UINT_8 ucMaxChannelNum, PUINT_8 pucNumOfChannel, P_RF_CHANNEL_INFO_T paucChannelList)

{

	UINT_8 i, j, ucNum;
@@ -828,6 +828,9 @@ rlmDomainGetChnlList(P_ADAPTER_T prAdapter, 
		    (prSubband->ucBand == BAND_5G && !prAdapter->fgEnable5GBand))

			continue;



		if (fgNoDfs == TRUE && prSubband->fgDfs == TRUE)

			continue;



		if (eSpecificBand == BAND_NULL || prSubband->ucBand == eSpecificBand) {

			for (j = 0; j < prSubband->ucNumChannels; j++) {

				if (ucNum >= ucMaxChannelNum)
@@ -843,6 +846,55 @@ rlmDomainGetChnlList(P_ADAPTER_T prAdapter, 
	*pucNumOfChannel = ucNum;

}



/*----------------------------------------------------------------------------*/

/*!

* \brief Retrieve DFS channels from 5G band

*

* \param[in/out] ucMaxChannelNum: max array size

*                pucNumOfChannel: pointer to returned channel number

*                paucChannelList: pointer to returned channel list array

*

* \return none

*/

/*----------------------------------------------------------------------------*/

VOID rlmDomainGetDfsChnls(P_ADAPTER_T prAdapter,

			  UINT_8 ucMaxChannelNum, PUINT_8 pucNumOfChannel, P_RF_CHANNEL_INFO_T paucChannelList)

{

	UINT_8 i, j, ucNum;

	P_DOMAIN_SUBBAND_INFO prSubband;

	P_DOMAIN_INFO_ENTRY prDomainInfo;



	ASSERT(prAdapter);

	ASSERT(paucChannelList);

	ASSERT(pucNumOfChannel);



	prDomainInfo = rlmDomainGetDomainInfo(prAdapter);

	ASSERT(prDomainInfo);



	ucNum = 0;

	for (i = 0; i < MAX_SUBBAND_NUM; i++) {

		prSubband = &prDomainInfo->rSubBand[i];



		if (prSubband->ucBand == BAND_5G) {

			if (!prAdapter->fgEnable5GBand)

				continue;



			if (prSubband->fgDfs == TRUE) {

				for (j = 0; j < prSubband->ucNumChannels; j++) {

					if (ucNum >= ucMaxChannelNum)

						break;

					paucChannelList[ucNum].eBand = prSubband->ucBand;

					paucChannelList[ucNum].ucChannelNum =

					    prSubband->ucFirstChannelNum + j * prSubband->ucChannelSpan;

					ucNum++;

				}

			}

		}

	}



	*pucNumOfChannel = ucNum;

}



/*----------------------------------------------------------------------------*/

/*!

* @brief

drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/gl_init.c

+1 −1
Original line number Diff line number Diff line
@@ -1940,7 +1940,7 @@ VOID wlanUpdateChannelTable(P_GLUE_INFO_T prGlueInfo) 


	/* 2. Get current domain channel list */

	rlmDomainGetChnlList(prGlueInfo->prAdapter,

			     BAND_NULL,

			     BAND_NULL, false,

			     ARRAY_SIZE(mtk_2ghz_channels) + ARRAY_SIZE(mtk_5ghz_channels),

			     &ucNumOfChannel, aucChannelList);

drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/gl_kal.c

+1 −1
Original line number Diff line number Diff line
@@ -4290,7 +4290,7 @@ kalGetChannelList(IN P_GLUE_INFO_T prGlueInfo, 
		  IN ENUM_BAND_T eSpecificBand,

		  IN UINT_8 ucMaxChannelNum, IN PUINT_8 pucNumOfChannel, IN P_RF_CHANNEL_INFO_T paucChannelList)

{

	rlmDomainGetChnlList(prGlueInfo->prAdapter, eSpecificBand, ucMaxChannelNum, pucNumOfChannel, paucChannelList);

	rlmDomainGetChnlList(prGlueInfo->prAdapter, eSpecificBand, false, ucMaxChannelNum, pucNumOfChannel, paucChannelList);

}



/*----------------------------------------------------------------------------*/