1 files changed, 27 insertions, 4 deletions
diff --git a/StdLib/EfiSocketLib/UseEfiSocketLib.c b/StdLib/EfiSocketLib/UseEfiSocketLib.c
index 1c122af650..ed72e8e763 100644
--- a/StdLib/EfiSocketLib/UseEfiSocketLib.c
+++ b/StdLib/EfiSocketLib/UseEfiSocketLib.c
@@ -29,6 +29,14 @@ CONST EFI_GUID mEslIp4ServiceGuid = {
 
 
 /**
+  Tag GUID - IPv6 in use by an application using EfiSocketLib
+**/
+CONST EFI_GUID mEslIp6ServiceGuid = {
+  0xc51b2761, 0xc476, 0x45fe, { 0xbe, 0x61, 0xba, 0x4b, 0xcc, 0x32, 0xf2, 0x34 }
+};
+
+
+/**
   Tag GUID - TCPv4 in use by an application using EfiSocketLib
 **/
 CONST EFI_GUID mEslTcp4ServiceGuid = {
@@ -37,6 +45,14 @@ CONST EFI_GUID mEslTcp4ServiceGuid = {
 
 
 /**
+  Tag GUID - TCPv6 in use by an application using EfiSocketLib
+**/
+CONST EFI_GUID mEslTcp6ServiceGuid = {
+  0x279858a4, 0x4e9e, 0x4e53, { 0x93, 0x22, 0xf2, 0x54, 0xe0, 0x7e, 0xef, 0xd4 }
+};
+
+
+/**
   Tag GUID - UDPv4 in use by an application using EfiSocketLib
 **/
 CONST EFI_GUID mEslUdp4ServiceGuid = {
@@ -45,6 +61,14 @@ CONST EFI_GUID mEslUdp4ServiceGuid = {
 
 
 /**
+  Tag GUID - UDPv6 in use by an application using EfiSocketLib
+**/
+CONST EFI_GUID mEslUdp6ServiceGuid = {
+  0xaa4af677, 0x6efe, 0x477c, { 0x96, 0x68, 0xe8, 0x13, 0x9d, 0x2, 0xfd, 0x9b }
+};
+
+
+/**
   Connect to the EFI socket library
 
   This routine creates the ::ESL_SOCKET structure and returns
@@ -252,10 +276,8 @@ EslServiceNetworkDisconnect (
                                        NULL,
                                        &HandleCount,
                                        &pHandles );
-    if ( EFI_ERROR ( Status )) {
-      break;
-    }
-    if ( NULL != pHandles ) {
+    if (( !EFI_ERROR ( Status ))
+      && ( NULL != pHandles )) {
       //
       //  Attempt to disconnect from this network adapter
       //
@@ -277,6 +299,7 @@ EslServiceNetworkDisconnect (
     //  Set the next network protocol
     //
     pSocketBinding += 1;
+    Status = EFI_SUCCESS;
   }
 
   //