diff options
| author | tobafo19 <[email protected]> | 2022-03-24 08:31:35 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-03-24 08:31:35 -0500 |
| commit | c4db3350be27b3bcf68dce5fdb7384e5df802ae4 (patch) | |
| tree | eb2d2bebcc44959a70777a0a81f72be038f267bb | |
| parent | 97c2e158657e80e081098c6a48b8e3360c01f2f7 (diff) | |
| parent | 2dad7325dc80b248c37a08fc815b8bde86170108 (diff) | |
Merge pull request #705 from pralater/master
Replace Deprecated API
| -rw-r--r-- | network/wlan/WDI/PLATFORM/NDIS6/WDI_Cmds.c | 6 | ||||
| -rw-r--r-- | network/wlan/WDI/PLATFORM/NDIS6/new.cpp | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/network/wlan/WDI/PLATFORM/NDIS6/WDI_Cmds.c b/network/wlan/WDI/PLATFORM/NDIS6/WDI_Cmds.c index 943038dd..983c81c9 100644 --- a/network/wlan/WDI/PLATFORM/NDIS6/WDI_Cmds.c +++ b/network/wlan/WDI/PLATFORM/NDIS6/WDI_Cmds.c @@ -2575,7 +2575,7 @@ Wdi_Set_Network_List_Offload( WDI_NETWORK_LIST_OFFLOAD_PARAMETERS *Params = pOidHandle->tlvParser.parsedTlv.paramNetworkListOffload; PWDI_NETWORK_LIST_OFFLOAD_INFO pWdiNLO = NULL; PWDI_SSID_OFFLOAD_CONTAINER pOffloadItem = NULL; - PWDI_CHANNEL_MAPPING_ENTRY pChannelItem = NULL; + PWDI_BAND_CHANNEL_MAPPING_ENTRY pChannelItem = NULL; PWDI_ALGO_PAIRS pAlgorithmItem = NULL; NDIS_STATUS ndisStatus = NDIS_STATUS_SUCCESS; @@ -2629,7 +2629,7 @@ Wdi_Set_Network_List_Offload( for( ItemCnt=0, Index=0 ; ItemCnt<pWdiNLO->SsidOffload.ElementCount ; ++ItemCnt) { pOffloadItem = &(pWdiNLO->SsidOffload.pElements[ItemCnt]); - pChannelItem = pOffloadItem->ChannellHintList.pElements; + pChannelItem = pOffloadItem->BandChannelHintList.pElements; for( i=0 ; i<pOffloadItem->UnicastAlgorithms.ElementCount ; ++i, ++Index) { @@ -2720,7 +2720,7 @@ Wdi_Set_Network_List_Offload( // Save channel info // DOT11_MAX_CHANNEL_HINTS 4 - for( ChannelIndex = 0 ; ChannelIndex < pOffloadItem->ChannellHintList.ElementCount ; ChannelIndex++ ) + for (ChannelIndex = 0; ChannelIndex < pOffloadItem->BandChannelHintList.ElementCount; ChannelIndex++) { pNLOInfo->dDot11OffloadNetworkList[Index].channelNumberHit[ChannelIndex] = pChannelItem[ChannelIndex].ChannelNumber; RT_TRACE( COMP_POWER, DBG_LOUD, (" %u", pNLOInfo->dDot11OffloadNetworkList[Index].channelNumberHit[ChannelIndex])); diff --git a/network/wlan/WDI/PLATFORM/NDIS6/new.cpp b/network/wlan/WDI/PLATFORM/NDIS6/new.cpp index 5b7eaf2b..7f6b201e 100644 --- a/network/wlan/WDI/PLATFORM/NDIS6/new.cpp +++ b/network/wlan/WDI/PLATFORM/NDIS6/new.cpp @@ -39,16 +39,11 @@ void* __cdecl operator new( --*/ { - PVOID pData = ExAllocatePoolWithTag( NonPagedPoolNx, Size, POOL_TAG ); + PVOID pData = ExAllocatePool2( POOL_FLAG_NON_PAGED, Size, POOL_TAG ); UNREFERENCED_PARAMETER( AllocationContext ); NT_ASSERT( AllocationContext == 0 ); - if ( pData != NULL ) - { - RtlZeroMemory( pData, Size ); - } - return pData; } |