From b1848123d234530731ac009b82e8eb3bccb04148 Mon Sep 17 00:00:00 2001
From: Guillaume Hetier <guhetier@microsoft.com>
Date: Fri, 3 Apr 2020 10:26:46 -0700
Subject: [PATCH] Fix WDI sample build

---
 network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj | 12 ++++++------
 network/wlan/WDI/PLATFORM/NDIS6/WDI_Cmds.c        | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj
index af48c0a4f..a8432de09 100644
--- a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj
+++ b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj
@@ -336,13 +336,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'">
     <Link>
       <AdditionalDependencies>$(SolutionDir)COMMON\$(Configuration)\common.lib;$(SolutionDir)PLATFORM\NdisComm\$(Configuration)\NdisComm.lib;$(SolutionDir)\LIB\x86\hal.lib;$(SolutionDir)\LIB\x86\rtklibcom.lib;$(WindowsSDK_LibraryPath_x86)km\x86\ndis.lib;$(WindowsSDK_LibraryPath_x86)km\x86\ntoskrnl.lib;$(WindowsSDK_LibraryPath_x86)km\x86\sdbus.lib;$(WindowsSDK_LibraryPath_x86)km\x86\wlan\1.0\TlvGeneratorParser.lib;</AdditionalDependencies>
-      <Driver>
-      </Driver>
-      <TreatLinkerWarningAsErrors>
-      </TreatLinkerWarningAsErrors>
+      <!-- warning LNK4099: PDB 'rtklibcom.pdb' was not found with 'rtklibcom.lib(multichannels.obj)' -->
+      <AdditionalOptions>$(AdditionalOptions) /IGNORE:4099</AdditionalOptions>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <LinkStatus>
-      </LinkStatus>
     </Link>
     <ClCompile>
       <PreprocessorDefinitions>_X86_;DBG;NDIS60_MINIPORT;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -425,6 +421,8 @@
       <DebugInformationFormat>None</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <!-- warning LNK4099: PDB 'rtklibcom.pdb' was not found with 'rtklibcom.lib(multichannels.obj)' -->
+      <AdditionalOptions>$(AdditionalOptions) /IGNORE:4099</AdditionalOptions>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <AdditionalDependencies>$(SolutionDir)COMMON\$(Configuration)\common.lib;$(SolutionDir)PLATFORM\NdisComm\$(Configuration)\NdisComm.lib;$(SolutionDir)\LIB\x86\hal.lib;$(SolutionDir)\LIB\x86\rtklibcom.lib;$(WindowsSDK_LibraryPath_x86)km\x86\ndis.lib;$(WindowsSDK_LibraryPath_x86)km\x86\ntoskrnl.lib;$(WindowsSDK_LibraryPath_x86)km\x86\sdbus.lib;$(WindowsSDK_LibraryPath_x86)km\x86\wlan\1.0\TlvGeneratorParser.lib;</AdditionalDependencies>
       <GenerateDebugInformation>
@@ -626,6 +624,8 @@
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <!-- warning LNK4099: PDB 'rtklibcom.pdb' was not found with 'rtklibcom.lib(multichannels.obj)' -->
+      <AdditionalOptions>$(AdditionalOptions) /IGNORE:4099</AdditionalOptions>
       <AdditionalDependencies>$(SolutionDir)COMMON\$(Configuration)\$(Platform)\common.lib;$(SolutionDir)PLATFORM\NdisComm\$(Configuration)\$(Platform)\NdisComm.lib;$(SolutionDir)\LIB\x64\hal.lib;$(SolutionDir)\LIB\x64\rtklibcom.lib;$(WindowsSDK_LibraryPath_x64)km\x64\ndis.lib;$(WindowsSDK_LibraryPath_x64)km\x64\ntoskrnl.lib;$(WindowsSDK_LibraryPath_x64)km\x64\sdbus.lib;$(WindowsSDK_LibraryPath_x64)km\x64\wlan\1.0\TlvGeneratorParser.lib;</AdditionalDependencies>
     </Link>
     <ProjectReference>
diff --git a/network/wlan/WDI/PLATFORM/NDIS6/WDI_Cmds.c b/network/wlan/WDI/PLATFORM/NDIS6/WDI_Cmds.c
index ec5cddd6b..943038dd8 100644
--- a/network/wlan/WDI/PLATFORM/NDIS6/WDI_Cmds.c
+++ b/network/wlan/WDI/PLATFORM/NDIS6/WDI_Cmds.c
@@ -3191,24 +3191,24 @@ Wdi_Set_Add_Pm_Protocol_Offload(
 
 
 	//2 DOT11 RSN REKey Offload
-	if(Params->DOT11RSNREKeyOffload.ProtocolOffloadId)
+	if(Params->DOT11RSNREKeyOffload.RsnKeyInfo.ProtocolOffloadId)
 	{
 		RT_TRACE(COMP_OID_SET, DBG_LOUD, ("ProtocolOffloadId = %d\n",
-			Params->DOT11RSNREKeyOffload.ProtocolOffloadId));
+			Params->DOT11RSNREKeyOffload.RsnKeyInfo.ProtocolOffloadId));
 
 		pMgntInfo->PowerSaveControl.PMProtocolOffloadIDs[eGTKOffloadIdx]
-			= Params->DOT11RSNREKeyOffload.ProtocolOffloadId;
+			= Params->DOT11RSNREKeyOffload.RsnKeyInfo.ProtocolOffloadId;
 
 		//Copy kck, kek
 		PlatformMoveMemory(&(pMgntInfo->PMDot11RSNRekeyPara.KCK),
-			Params->DOT11RSNREKeyOffload.KCK_CONTENT, 32);
+			&Params->DOT11RSNREKeyOffload.RsnKeyInfo.KCK_CONTENT, 32);
 
 		RT_PRINT_DATA( COMP_OID_SET, DBG_LOUD, ("KCK_CONTENT:\n"),
 			pMgntInfo->PMDot11RSNRekeyPara.KCK, 16);
 		RT_PRINT_DATA( COMP_OID_SET, DBG_LOUD, ("KEK_CONTENT:\n"),
 			pMgntInfo->PMDot11RSNRekeyPara.KEK, 16);
 
-		pMgntInfo->PMDot11RSNRekeyPara.KeyReplayCounter = Params->DOT11RSNREKeyOffload.ReplayCounter;
+		pMgntInfo->PMDot11RSNRekeyPara.KeyReplayCounter = Params->DOT11RSNREKeyOffload.RsnKeyInfo.ReplayCounter;
 
 		if(pPSC->RegGTKOffloadEnable)
 			pPSC->GTKOffloadEnable = TRUE;