From 305a12799e69c9247bea76f37d707eeedb3dc9e2 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Tue, 16 Oct 2007 09:23:09 +0000 Subject: Merger network tackers 9307, 9338, 9339, 9397 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4130 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'MdeModulePkg') diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c index 31d9e8b903..bec1a4f0b0 100644 --- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c +++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c @@ -622,14 +622,15 @@ Ip4ConfigOnDhcp4Complete ( NetFreePool (Instance->NicConfig); } - Instance->NicConfig = NetAllocatePool (sizeof (NIC_IP4_CONFIG_INFO) + - sizeof (EFI_IP4_ROUTE_TABLE)); + Instance->NicConfig = NetAllocatePool (sizeof (NIC_IP4_CONFIG_INFO) + 2* sizeof (EFI_IP4_ROUTE_TABLE)); if (Instance->NicConfig == NULL) { Instance->Result = EFI_OUT_OF_RESOURCES; goto ON_EXIT; } + Instance->NicConfig->Ip4Info.RouteTable = (EFI_IP4_ROUTE_TABLE *) (Instance->NicConfig + 1); + CopyMem (&Instance->NicConfig->NicAddr, &Instance->NicAddr, sizeof (Instance->NicConfig->NicAddr)); Instance->NicConfig->Source = IP4_CONFIG_SOURCE_DHCP; Instance->NicConfig->Perment = Perment; @@ -645,7 +646,7 @@ Ip4ConfigOnDhcp4Complete ( NetCopyMem (&Ip1, &Dhcp4Mode.ClientAddress, sizeof (IP4_ADDR)); NetCopyMem (&Ip2, &Dhcp4Mode.SubnetMask, sizeof (IP4_ADDR)); - + Subnet = Ip1 & Ip2; NetCopyMem (&Ip4Config->RouteTable[0].SubnetAddress, &Subnet, sizeof (EFI_IPv4_ADDRESS)); -- cgit v1.2.3