1 files changed, 7 insertions, 1 deletions
diff --git a/NetworkPkg/Ip6Dxe/Ip6Nd.c b/NetworkPkg/Ip6Dxe/Ip6Nd.c
index d510f330c1..9f30f9b20e 100644
--- a/NetworkPkg/Ip6Dxe/Ip6Nd.c
+++ b/NetworkPkg/Ip6Dxe/Ip6Nd.c
@@ -821,7 +821,8 @@ Ip6OnDADFinished (
   UINT16                    OptBuf[4];
   EFI_DHCP6_PACKET_OPTION   *Oro;
   EFI_DHCP6_RETRANSMISSION  InfoReqReXmit;
-
+  EFI_IPv6_ADDRESS          AllNodes;
+  
   IpSb     = IpIf->Service;
   AddrInfo = DadEntry->AddressInfo;
 
@@ -922,6 +923,11 @@ Ip6OnDADFinished (
     RemoveEntryList (&DadEntry->Link);
     FreePool (DadEntry);
     //
+    // Leave link-scope all-nodes multicast address (FF02::1)
+    //
+    Ip6SetToAllNodeMulticast (FALSE, IP6_LINK_LOCAL_SCOPE, &AllNodes);
+    Ip6LeaveGroup (IpSb, &AllNodes);
+    //
     // Disable IP operation since link-local address is a duplicate address.
     //
     IpSb->LinkLocalDadFail = TRUE;