diff --git a/drivers/network/afd/afd/tdi.c b/drivers/network/afd/afd/tdi.c
index e0727e125f1..925a07277fe 100644
--- a/drivers/network/afd/afd/tdi.c
+++ b/drivers/network/afd/afd/tdi.c
@@ -673,7 +673,6 @@ NTSTATUS TdiQueryInformationEx(
                                  OutputLength);                             /* Return information */
 }
 
-#if 0
 NTSTATUS TdiQueryAddress(
     PFILE_OBJECT FileObject,
     PULONG Address)
@@ -807,7 +806,6 @@ NTSTATUS TdiQueryAddress(
 
     return Status;
 }
-#endif
 
 NTSTATUS TdiSend
 ( PIRP *Irp,
diff --git a/drivers/network/afd/include/afd.h b/drivers/network/afd/include/afd.h
index 1d93fb1b42f..e77d64bf598 100644
--- a/drivers/network/afd/include/afd.h
+++ b/drivers/network/afd/include/afd.h
@@ -31,6 +31,52 @@
 #define IOCTL_TCP_QUERY_INFORMATION_EX \
 	CTL_CODE(FILE_DEVICE_NETWORK, 0, METHOD_NEITHER, FILE_ANY_ACCESS)
 
+#define TL_INSTANCE 0
+#define	IP_MIB_STATS_ID 1
+#define	IP_MIB_ADDRTABLE_ENTRY_ID 0x102
+
+typedef struct IPSNMP_INFO {
+	ULONG Forwarding;
+	ULONG DefaultTTL;
+	ULONG InReceives;
+	ULONG InHdrErrors;
+	ULONG InAddrErrors;
+	ULONG ForwDatagrams;
+	ULONG InUnknownProtos;
+	ULONG InDiscards;
+	ULONG InDelivers;
+	ULONG OutRequests;
+	ULONG RoutingDiscards;
+	ULONG OutDiscards;
+	ULONG OutNoRoutes;
+	ULONG ReasmTimeout;
+	ULONG ReasmReqds;
+	ULONG ReasmOks;
+	ULONG ReasmFails;
+	ULONG FragOks;
+	ULONG FragFails;
+	ULONG FragCreates;
+	ULONG NumIf;
+	ULONG NumAddr;
+	ULONG NumRoutes;
+} IPSNMP_INFO, *PIPSNMP_INFO;
+
+typedef struct IPADDR_ENTRY {
+	ULONG  Addr;
+	ULONG  Index;
+	ULONG  Mask;
+	ULONG  BcastAddr;
+	ULONG  ReasmSize;
+	USHORT Context;
+	USHORT Pad;
+} IPADDR_ENTRY, *PIPADDR_ENTRY;
+
+#define DN2H(dw) \
+    ((((dw) & 0xFF000000L) >> 24) | \
+	 (((dw) & 0x00FF0000L) >> 8) | \
+	 (((dw) & 0x0000FF00L) << 8) | \
+	 (((dw) & 0x000000FFL) << 24))
+
 #define SOCKET_STATE_INVALID_TRANSITION ((DWORD)-1)
 #define SOCKET_STATE_CREATED            0
 #define SOCKET_STATE_BOUND              1