From ecbd055d4e8d83b71578e8ec5e32b09e4e9d3a81 Mon Sep 17 00:00:00 2001
From: Jiaxin Wu <Jiaxin.wu@intel.com>
Date: Wed, 29 Aug 2018 11:04:45 +0800
Subject: [PATCH] MdeModulePkg/Ip4Dxe: Sync the direct route entry setting.

v2: use "IP & Netmask" directly instead of defining an additional variable.

This patch is to sync the direct route entry setting in both the default
and Instance route table {Subnet, Mask, NextHope} (
https://bugzilla.tianocore.org/show_bug.cgi?id=1143).

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
---
 MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c |  7 -------
 MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c        | 10 +++++++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c
index c19a72730e..b52542cd84 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c
@@ -559,13 +559,6 @@ Ip4Config2SetDefaultAddr (
     }
   }
 
-  Ip4AddRoute (
-    IpSb->DefaultRouteTable,
-    StationAddress,
-    SubnetMask,
-    IP4_ALLZERO_ADDRESS
-    );
-
   //
   // Add a route for the connected network.
   //
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
index 87aadf13e4..b1af5294fb 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
@@ -672,10 +672,14 @@ Ip4ConfigProtocol (
     }
 
     //
-    // Add a route to this connected network in the route table
+    // Add a route to this connected network in the instance route table.
     //
-    Ip4AddRoute (IpInstance->RouteTable, Ip, Netmask, IP4_ALLZERO_ADDRESS);
-
+    Ip4AddRoute (
+      IpInstance->RouteTable, 
+      Ip & Netmask, 
+      Netmask, 
+      IP4_ALLZERO_ADDRESS
+      );
   } else {
     //
     // Use the default address. Check the state.