Changeset 41272 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

May 14, 2012 9:02:00 AM (13 years ago)

Author:

vboxsync

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

77932

Message:

Network: Increased the limit of host-only interfaces to 128.

Location:

trunk/src/VBox/HostDrivers/VBoxNetAdp

Files:

• VBoxNetAdp.c (modified) (1 diff)
• VBoxNetAdpInternal.h (modified) (2 diffs)
• linux/VBoxNetAdp-linux.c (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c

@@ -1185 +1185 @@
     memset(g_aUnits, 0, sizeof(g_aUnits));
     memset(g_aAdapters, 0, sizeof(g_aAdapters));
+    LogFlow(("vboxnetadp: max host-only interfaces supported: %d (%d bytes)\n",
+             VBOXNETADP_MAX_INSTANCES, sizeof(g_aAdapters)));
     for (i = 0; i < RT_ELEMENTS(g_aAdapters); i++)
     {

trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h

@@ -30 +30 @@
 typedef struct VBOXNETADPGLOBALS *PVBOXNETADPGLOBALS;
 
-#define VBOXNETADP_MAX_INSTANCES   8
+#define VBOXNETADP_MAX_INSTANCES   128
 #define VBOXNETADP_MAX_UNITS       128
 #define VBOXNETADP_NAME            "vboxnet"
@@ -126 +126 @@
         void *pvAlign;
         /** Padding. */
-#if defined(RT_OS_WINDOWS)
-# if defined(VBOX_NETFLT_ONDEMAND_BIND)
-        uint8_t abPadding[192];
-# else
-        uint8_t abPadding[1024];
-# endif
-#elif defined(RT_OS_LINUX)
         uint8_t abPadding[64];
-#else
-        uint8_t abPadding[64];
-#endif
     } u;
     /** The interface name. */

trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c

@@ -315 +315 @@
             {
                 Log(("VBoxNetAdpLinuxIOCtl: vboxNetAdpCreate -> %Rrc\n", rc));
-                return -EINVAL;
+                return -(rc == VERR_OUT_OF_RESOURCES ? ENOMEM : EINVAL);
             }