Changeset 52134 in vbox for trunk/include/VBox

Timestamp:

Jul 22, 2014 5:39:46 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95163

Message:

NDIS6: Cumulative commit containing async send, unload race fix (intnet), missing offload fix, basic vboxnetadp6.sys (#7231)

File:

• trunk/include/VBox/intnet.h (modified) (4 diffs)

trunk/include/VBox/intnet.h

@@ -561 +561 @@
     DECLR0CALLBACKMEMBER(void, pfnReportNoPreemptDsts,(PINTNETTRUNKSWPORT pSwitchPort, uint32_t fNoPreemptDsts));
 
+#if VBOX_WITH_INTNET_DISCONNECT
+    /**
+     * Reports premature destruction of NetFlt instance by OS.
+     *
+     * @param   pSwitchPort         Pointer to this structure.
+     */
+    DECLR0CALLBACKMEMBER(void, pfnDisconnect,(PINTNETTRUNKSWPORT pSwitchPort));
+#endif /* VBOX_WITH_INTNET_DISCONNECT */
+
     /** Structure version number. (INTNETTRUNKSWPORT_VERSION) */
     uint32_t u32VersionEnd;
@@ -566 +575 @@
 
 /** Version number for the INTNETTRUNKIFPORT::u32Version and INTNETTRUNKIFPORT::u32VersionEnd fields. */
+#ifdef VBOX_WITH_INTNET_DISCONNECT
+#define INTNETTRUNKSWPORT_VERSION   UINT32_C(0xA2CDf002)
+#else /* !VBOX_WITH_INTNET_DISCONNECT */
 #define INTNETTRUNKSWPORT_VERSION   UINT32_C(0xA2CDf001)
+#endif /* !VBOX_WITH_INTNET_DISCONNECT */
 
 
@@ -624 +637 @@
      * @remarks May own the big mutex, no spinlocks.
      */
+#ifdef VBOX_WITH_INTNET_DISCONNECT
+    DECLR0CALLBACKMEMBER(void, pfnRelease,(PINTNETTRUNKIFPORT pIfPort, bool fBusy));
+#else /* !VBOX_WITH_INTNET_DISCONNECT */
     DECLR0CALLBACKMEMBER(void, pfnRelease,(PINTNETTRUNKIFPORT pIfPort));
+#endif /* !VBOX_WITH_INTNET_DISCONNECT */
 
     /**
@@ -746 +763 @@
 
 /** Version number for the INTNETTRUNKIFPORT::u32Version and INTNETTRUNKIFPORT::u32VersionEnd fields. */
+#ifdef VBOX_WITH_INTNET_DISCONNECT
+#define INTNETTRUNKIFPORT_VERSION   UINT32_C(0xA2CDe002)
+#else /* !VBOX_WITH_INTNET_DISCONNECT */
 #define INTNETTRUNKIFPORT_VERSION   UINT32_C(0xA2CDe001)
+#endif /* !VBOX_WITH_INTNET_DISCONNECT */