- if (EFI_IP4 (Dhcp4Mode.RouterAddress) != 0) {\r
- Ip4Config->RouteTableSize = 2;\r
- EFI_IP4 (Ip4Config->RouteTable[1].SubnetAddress) = 0;\r
- EFI_IP4 (Ip4Config->RouteTable[1].SubnetMask) = 0;\r
- Ip4Config->RouteTable[1].GatewayAddress = Dhcp4Mode.RouterAddress;\r
+ if (!EFI_IP4_EQUAL (&Dhcp4Mode.RouterAddress, &mZeroIp4Addr)) {\r
+ Ip4Config->RouteTableSize = 2;\r
+\r
+ ZeroMem (&Ip4Config->RouteTable[1].SubnetAddress, sizeof (EFI_IPv4_ADDRESS));\r
+ ZeroMem (&Ip4Config->RouteTable[1].SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+ CopyMem (&Ip4Config->RouteTable[1].GatewayAddress, &Dhcp4Mode.RouterAddress, sizeof (EFI_IPv4_ADDRESS));\r