1 files changed, 16 insertions, 20 deletions
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index 6711636333..e4ab17a37e 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
@@ -740,11 +740,24 @@ Ip4FreeInterface (
   //
   Ip4CancelFrames (Interface, EFI_ABORTED, Ip4CancelInstanceFrame, IpInstance);
 
+  if (--Interface->RefCnt > 0) {
+    return EFI_SUCCESS;
+  }
+
   //
-  // Destroy the ARP instance if this is the last IP instance that
-  // has the address.
+  // Destroy the interface if this is the last IP instance that
+  // has the address. Remove all the system transmitted packets
+  // from this interface, cancel the receive request if there is
+  // one, and destroy the ARP requests.
   //
-  if (Interface->Arp != NULL && IsListEmpty (&Interface->IpInstances)) {
+  Ip4CancelFrames (Interface, EFI_ABORTED, Ip4CancelInstanceFrame, NULL);
+  Ip4CancelReceive (Interface);
+
+  ASSERT (IsListEmpty (&Interface->IpInstances));
+  ASSERT (IsListEmpty (&Interface->ArpQues));
+  ASSERT (IsListEmpty (&Interface->SentFrames));
+
+  if (Interface->Arp != NULL) {
     gBS->CloseProtocol (
           Interface->ArpHandle,
           &gEfiArpProtocolGuid,
@@ -758,25 +771,8 @@ Ip4FreeInterface (
       &gEfiArpServiceBindingProtocolGuid,
       Interface->ArpHandle
       );
-    Interface->Arp = NULL;
-  }
-  
-  if (--Interface->RefCnt > 0) {
-    return EFI_SUCCESS;
   }
 
-  //
-  // Destroy the interface if it is not referenced by any IP instance (for common Interface)
-  // or the IP service (for the DefaultInterface). Remove all the system transmitted packets
-  // from this interface, cancel the receive request if there is one.
-  //
-  Ip4CancelFrames (Interface, EFI_ABORTED, Ip4CancelInstanceFrame, NULL);
-  Ip4CancelReceive (Interface);
-
-  ASSERT (IsListEmpty (&Interface->IpInstances));
-  ASSERT (IsListEmpty (&Interface->ArpQues));
-  ASSERT (IsListEmpty (&Interface->SentFrames));
-
   RemoveEntryList (&Interface->Link);
   FreePool (Interface);