From 216f79703b8cb8dc65abdd768bedb2bcdbc1a1f8 Mon Sep 17 00:00:00 2001 From: sfu5 Date: Thu, 13 Dec 2012 06:47:06 +0000 Subject: 1. Add EFI_COMPONENT_NAME2_PROTOCOL.GetControllerName() support. 2. Fix the driver binding Stop() hang issue in the network stack. 3. Add Ip4 raw data support. 4. Add iSCSI Dhcp option 60 support. Signed-off-by: Fu Siyuan Reviewed-by: Ye Ting Reviewed-by: Ouyang Qian git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13995 6f19259b-4bc3-4df7-8a09-765794883524 --- NetworkPkg/Ip6Dxe/Ip6Impl.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'NetworkPkg/Ip6Dxe/Ip6Impl.c') diff --git a/NetworkPkg/Ip6Dxe/Ip6Impl.c b/NetworkPkg/Ip6Dxe/Ip6Impl.c index 44e0392511..365495a5e4 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Impl.c +++ b/NetworkPkg/Ip6Dxe/Ip6Impl.c @@ -635,7 +635,7 @@ EfiIp6Configure ( IpInstance = IP6_INSTANCE_FROM_PROTOCOL (This); IpSb = IpInstance->Service; - if (IpSb->LinkLocalDadFail) { + if (IpSb->LinkLocalDadFail && Ip6ConfigData != NULL) { return EFI_DEVICE_ERROR; } @@ -1777,10 +1777,6 @@ EfiIp6Cancel ( IpInstance = IP6_INSTANCE_FROM_PROTOCOL (This); IpSb = IpInstance->Service; - if (IpSb->LinkLocalDadFail) { - return EFI_DEVICE_ERROR; - } - OldTpl = gBS->RaiseTPL (TPL_CALLBACK); if (IpInstance->State != IP6_STATE_CONFIGED) { -- cgit v1.2.3