Imported Upstream version 4.3.10-dfsgupstream/4.3.10-dfsgupstream

1 files changed, 6 insertions, 8 deletions

diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp b/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp
index 0a01075cc..8e0cfd27f 100644
--- a/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp
+++ b/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp
@@ -362,7 +362,7 @@ int VBoxNetBaseService::tryGoOnline(void)
     {
         m->m_pSession = NIL_RTR0PTR;
         LogRel(("VBoxNetBaseService: SUPR3Init -> %Rrc\n", rc));
-        return 1;
+        return rc;
     }
 
     char szPath[RTPATH_MAX];
@@ -370,14 +370,14 @@ int VBoxNetBaseService::tryGoOnline(void)
     if (RT_FAILURE(rc))
     {
         LogRel(("VBoxNetBaseService: RTPathExecDir -> %Rrc\n", rc));
-        return 1;
+        return rc;
     }
 
     rc = SUPR3LoadVMM(strcat(szPath, "/VMMR0.r0"));
     if (RT_FAILURE(rc))
     {
         LogRel(("VBoxNetBaseService: SUPR3LoadVMM(\"%s\") -> %Rrc\n", szPath, rc));
-        return 1;
+        return rc;
     }
 
     /*
@@ -406,7 +406,7 @@ int VBoxNetBaseService::tryGoOnline(void)
     if (RT_FAILURE(rc))
     {
         Log2(("VBoxNetBaseService: SUPR3CallVMMR0Ex(,VMMR0_DO_INTNET_OPEN,) failed, rc=%Rrc\n", rc));
-        goto bad;
+        return rc;
     }
     m->m_hIf = OpenReq.hIf;
     Log2(("successfully opened/created \"%s\" - hIf=%#x\n", OpenReq.szNetwork, m->m_hIf));
@@ -425,7 +425,7 @@ int VBoxNetBaseService::tryGoOnline(void)
     if (RT_FAILURE(rc))
     {
         Log2(("VBoxNetBaseService: SUPR3CallVMMR0Ex(,VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS,) failed, rc=%Rrc\n", rc));
-        goto bad;
+        return rc;
     }
     pBuf = GetBufferPtrsReq.pRing3Buf;
     Log2(("pBuf=%p cbBuf=%d cbSend=%d cbRecv=%d\n",
@@ -448,9 +448,7 @@ int VBoxNetBaseService::tryGoOnline(void)
     /* bail out */
     Log2(("VBoxNetBaseService: SUPR3CallVMMR0Ex(,VMMR0_DO_INTNET_IF_SET_PROMISCUOUS_MODE,) failed, rc=%Rrc\n", rc));
 
-    return 0;
-    bad:
-        return 1;
+    return VINF_SUCCESS;
 }