Hi Ashish, + Ip4NvData->Policy = Ip4Config2PolicyDhcp; + Status = Ip4Cfg2->SetData ( + Ip4Cfg2, + Ip4Config2DataTypePolicy, + sizeof (EFI_IP4_CONFIG2_POLICY), + &Ip4NvData->Policy + );
Here we're assuming IfrFormNvData->DhcpEnable is TRUE. Should we check it before setting the policy and calling SetData()? Thanks, Saloni From: Ashish Singhal <ashishsin...@nvidia.com> Sent: Monday, January 1, 2024 8:48 AM To: devel@edk2.groups.io; Kasbekar, Saloni <saloni.kasbe...@intel.com>; Clark-williams, Zachary <zachary.clark-willi...@intel.com>; Jeff Brasen <jbra...@nvidia.com> Subject: Re: [PATCH] NetworkPkg/Ip4Dxe: Fix Reset To Default Hello, Checking again for some feedback on this. Thanks Ashish ________________________________ From: Ashish Singhal <ashishsin...@nvidia.com<mailto:ashishsin...@nvidia.com>> Sent: Thursday, December 14, 2023 4:42 PM To: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>>; saloni.kasbe...@intel.com<mailto:saloni.kasbe...@intel.com> <saloni.kasbe...@intel.com<mailto:saloni.kasbe...@intel.com>>; zachary.clark-willi...@intel.com<mailto:zachary.clark-willi...@intel.com> <zachary.clark-willi...@intel.com<mailto:zachary.clark-willi...@intel.com>>; Jeff Brasen <jbra...@nvidia.com<mailto:jbra...@nvidia.com>> Cc: Ashish Singhal <ashishsin...@nvidia.com<mailto:ashishsin...@nvidia.com>> Subject: [PATCH] NetworkPkg/Ip4Dxe: Fix Reset To Default Exercising reset to default does not reset the settings. Add handler code for the case where configuration is disabled. Signed-off-by: Ashish Singhal <ashishsin...@nvidia.com<mailto:ashishsin...@nvidia.com>> --- NetworkPkg/Ip4Dxe/Ip4Config2Nv.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c b/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c index e0b6a4d4a9..dac5817b7c 100644 --- a/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c +++ b/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c @@ -586,6 +586,31 @@ Ip4Config2ConvertIfrNvDataToConfigNvData ( } if (IfrFormNvData->Configure != TRUE) { + if (Ip4NvData->DnsAddress != NULL) { + FreePool (Ip4NvData->DnsAddress); + Ip4NvData->DnsAddress = NULL; + Ip4NvData->DnsAddressCount = 0; + } + + if (Ip4NvData->GatewayAddress != NULL) { + FreePool (Ip4NvData->GatewayAddress); + Ip4NvData->GatewayAddress = NULL; + Ip4NvData->GatewayAddressCount = 0; + } + + if (Ip4NvData->ManualAddress != NULL) { + FreePool (Ip4NvData->ManualAddress); + Ip4NvData->ManualAddress = NULL; + Ip4NvData->ManualAddressCount = 0; + } + + Ip4NvData->Policy = Ip4Config2PolicyDhcp; + Status = Ip4Cfg2->SetData ( + Ip4Cfg2, + Ip4Config2DataTypePolicy, + sizeof (EFI_IP4_CONFIG2_POLICY), + &Ip4NvData->Policy + ); return EFI_SUCCESS; } -- 2.17.1 Hello, -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113041): https://edk2.groups.io/g/devel/message/113041 Mute This Topic: https://groups.io/mt/103181314/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
