Fix build break for NETCX2.6 only APIs

4 files changed, 19 insertions, 15 deletions

diff --git a/network/netadaptercx/netvadapterlibrary/code/queue.cpp b/network/netadaptercx/netvadapterlibrary/code/queue.cpp
index f4a12c2a..cf2aa586 100644
--- a/network/netadaptercx/netvadapterlibrary/code/queue.cpp
+++ b/network/netadaptercx/netvadapterlibrary/code/queue.cpp
@@ -33,6 +33,7 @@ NetvQueue::GetFragmentRing(
     return NetRingCollectionGetFragmentRing(m_rings);
 }
 
+#if ((NETADAPTER_VERSION_MAJOR == 2) && (NETADAPTER_VERSION_MINOR >= 6))
 NET_RING *
 NetvQueue::GetNetMemoryReturnRing(
     void
@@ -40,3 +41,4 @@ NetvQueue::GetNetMemoryReturnRing(
 {
     return NetRingCollectionGetFragmentReturnContextRing(m_rings);
 }
+#endif // NETCX 2.6 only
\ No newline at end of file
diff --git a/network/netadaptercx/netvadapterlibrary/code/queue.h b/network/netadaptercx/netvadapterlibrary/code/queue.h
index 64012298..da101fd3 100644
--- a/network/netadaptercx/netvadapterlibrary/code/queue.h
+++ b/network/netadaptercx/netvadapterlibrary/code/queue.h
@@ -26,10 +26,12 @@ public:
         void
     );
 
+#if ((NETADAPTER_VERSION_MAJOR == 2) && (NETADAPTER_VERSION_MINOR >= 6))
     NET_RING *
     GetNetMemoryReturnRing(
         void
     );
+#endif // NETCX 2.6 only
 
     NETPACKETQUEUE const
         m_handle{WDF_NO_HANDLE};
diff --git a/network/wlan/WIFICX/drivercode/device.cpp b/network/wlan/WIFICX/drivercode/device.cpp
index 9404b161..31639c9f 100644
--- a/network/wlan/WIFICX/drivercode/device.cpp
+++ b/network/wlan/WIFICX/drivercode/device.cpp
@@ -80,6 +80,9 @@ NTSTATUS EvtWifiDeviceCreateAdapter(WDFDEVICE Device, NETADAPTER_INIT* AdapterIn
         return ntStatus;
     }
 
+    auto wifiNetvDevice = WifiGetIhvDeviceContext(Device);
+    wifiNetvDevice->netAdapters[WifiAdapterGetPortId(netAdapter)] = netAdapter;
+
     WFCInfo("%!FUNC!: Success!");
     return ntStatus;
 }
diff --git a/network/wlan/WIFICX/drivercode/wifihal.cpp b/network/wlan/WIFICX/drivercode/wifihal.cpp
index 5283474c..29de321b 100644
--- a/network/wlan/WIFICX/drivercode/wifihal.cpp
+++ b/network/wlan/WIFICX/drivercode/wifihal.cpp
@@ -606,10 +606,9 @@ NTSTATUS WifiHAL::WifiIhvConnect(const WDI_TASK_CONNECT_PARAMETERS& ConnectParam
     NT_ASSERT(m_LastConnectEntryId == 0);
     if (m_LastConnectEntryId != 0) // Not Disconnected State
     {
-#ifdef WIFI_IHV_NETV
-        DeleteDatapathPeer(
-            deviceContext->netAdapters[pWdiHeader->PortId], reinterpret_cast<NET_EUI48_ADDRESS*>(&deviceContext->ConnectedPeer));
-#endif // WIFI_IHV_NETV
+        WifiAdapterRemovePeer(
+            WifiGetIhvDeviceContext(m_Device)->netAdapters[pWdiHeader->PortId],
+            reinterpret_cast<NET_EUI48_ADDRESS*>(&m_ConnectedPeer));
     }
 
     WX_RETURN_NTSTATUS_IF_NOT_NT_SUCCESS_MSG(WifiIhvPerformAssociation(
@@ -704,11 +703,9 @@ NTSTATUS WifiHAL::WifiIhvPerformAssociation(
     UINT32 NewConnectEntryId = 0; // Disconnected State
     WDI_AUTH_ALGORITHM NewAuthAlgo = pAuthenticationAlgorithms->pElements[0];
     UCHAR pucData[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10 };
-#ifdef WIFI_IHV_NETV
-    WifiNetvDevice* pDeviceContext = WifiNetvDeviceGetContext(Device);
-#else
+
     PWIFI_IHV_DEVICE_CONTEXT pDeviceContext = WifiGetIhvDeviceContext(m_Device);
-#endif // WIFI_IHV_NETV
+
     ULONG assocStatus = WDI_ASSOC_STATUS_SUCCESS;
 
     do
@@ -727,12 +724,10 @@ NTSTATUS WifiHAL::WifiIhvPerformAssociation(
 
                     NewConnectEntryId = connectEntry;
                     m_LastConnectTransactionId = pWdiHeader->TransactionId;
-#ifdef WIFI_IHV_NETV
+
                     // add peer on datapath
-                    AddDatapathPeer(pDeviceContext->netAdapters[pWdiHeader->PortId],
+                    WifiAdapterAddPeer(pDeviceContext->netAdapters[pWdiHeader->PortId],
                         reinterpret_cast<NET_EUI48_ADDRESS*>(g_ConnectEntries[connectEntry].pMacAddress));
-#endif // WIFI_IHV_NETV
-
 #ifdef  WIFI_IHV_HANDSHAKE
                     // Pretend to recieve M1 on datapath before, the association complete has made it up the control path.
                     RecieveDatapathFrame(0x33, sizeof(pucData), pucData);
@@ -976,9 +971,11 @@ NTSTATUS WifiHAL::WifiIhvDisconnect(const WDI_TASK_DISCONNECT_PARAMETERS&, const
 
     m_LastConnectEntryId = 0; // Disconnected State
 
-#ifdef WIFI_IHV_NETV
-    DeleteDatapathPeer(0x33);
-#endif
+    WifiAdapterRemovePeer(
+        WifiGetIhvDeviceContext(m_Device)->netAdapters[pWdiHeader->PortId],
+        reinterpret_cast<NET_EUI48_ADDRESS*>(&m_ConnectedPeer));
+
+    RtlZeroMemory(&m_ConnectedPeer, sizeof(DOT11_MAC_ADDRESS));
 
     return STATUS_SUCCESS;
 }