X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FUniversal%2FNetwork%2FPxeBc%2FDxe%2Fpxe_bc_dhcp.c;h=a1f4715cd04ecb0ff419bb7e99635f76e270285f;hp=56893bce2fbe4edf722a4e0ba52f220cee0d5bc8;hb=9887e0d069ef44bff56733d2c1eb5a1064311fea;hpb=56056c7cd8c829baa5941f5650b3739e074c7f71

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
index 56893bce2f..a1f4715cd0 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
@@ -1607,14 +1607,19 @@ TryBINL (
   DhcpRxBuf = &RxBuf[OfferIx];
 
   //
-  // send DHCP request
-  // if fail return false
+  // use next server address first.
   //
-  CopyMem (
-    ((EFI_IPv4_ADDRESS *) &ServerIp),
-    &((DHCPV4_OP_SERVER_IP *) DhcpRxBuf->OpAdds.PktOptAdds[OP_DHCP_SERVER_IP_IX - 1])->Ip,
-    sizeof (EFI_IPv4_ADDRESS)
-    );
+  ServerIp.Addr[0] = DhcpRxBuf->u.Dhcpv4.siaddr;
+  if (ServerIp.Addr[0] == 0) {
+    //
+    // next server address is NULL, use option 54.
+    //
+    CopyMem (
+      ((EFI_IPv4_ADDRESS *) &ServerIp),
+      &((DHCPV4_OP_SERVER_IP *) DhcpRxBuf->OpAdds.PktOptAdds[OP_DHCP_SERVER_IP_IX - 1])->Ip,
+      sizeof (EFI_IPv4_ADDRESS)
+      );
+  }
 
   //
   // client IP address - filled in by client if it knows it