From 44a97ac647a6c996ec1479f518fe0ea0c7a1ce7f Mon Sep 17 00:00:00 2001
From: sfu5 <sfu5@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 11 Mar 2013 07:44:10 +0000
Subject: [PATCH] =?utf8?q?Fix=20a=20bug=20in=20IP4=20driver=20that=20the?=
 =?utf8?q?=20broadcast/multicast=20mac=20address=20is=20overrided=20by=20t?=
 =?utf8?q?he=20gateway=E2=80=99s=20mac=20address.=20Signed-off-by:=20Fu=20?=
 =?utf8?q?Siyuan=20<siyuan.fu@intel.com>=20Reviewed-by:=20Ye=20Ting=20<tin?=
 =?utf8?q?g.ye@intel.com>=20Reviewed-by:=20Ouyang=20Qian=20<qian.ouyang@in?=
 =?utf8?q?tel.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14167 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Universal/Network/Ip4Dxe/Ip4Output.c      | 66 +++++++++----------
 1 file changed, 30 insertions(+), 36 deletions(-)

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
index 7ff17b6637..370eaa6a9f 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
@@ -1,7 +1,7 @@
 /** @file
   Transmit the IP4 packet.
   
-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -286,46 +286,40 @@ Ip4Output (
   if (EFI_ERROR(Status)) {
     return Status;
   }
+  
+  Dest = Head->Dst;
+  if (IP4_IS_BROADCAST (Ip4GetNetCast (Dest, IpIf)) || (Dest == IP4_ALLONE_ADDRESS)) {
+    //
+    // Set the gateway to local broadcast if the Dest is
+    // the broadcast address for the connected network or
+    // it is local broadcast.
+    //
+    GateWay = IP4_ALLONE_ADDRESS;
 
-  //
-  // Route the packet unless overrided, that is, GateWay isn't zero.
-  //
-  if (GateWay == IP4_ALLZERO_ADDRESS) {
-    Dest = Head->Dst;
-
-    if (IP4_IS_BROADCAST (Ip4GetNetCast (Dest, IpIf)) || (Dest == IP4_ALLONE_ADDRESS)) {
-      //
-      // Set the gateway to local broadcast if the Dest is
-      // the broadcast address for the connected network or
-      // it is local broadcast.
-      //
-      GateWay = IP4_ALLONE_ADDRESS;
-
-    } else if (IP4_IS_MULTICAST (Dest)) {
-      //
-      // Set the gateway to the destination if it is an multicast
-      // address. The IP4_INTERFACE won't consult ARP to send local
-      // broadcast and multicast.
-      //
-      GateWay = Head->Dst;
+  } else if (IP4_IS_MULTICAST (Dest)) {
+    //
+    // Set the gateway to the destination if it is an multicast
+    // address. The IP4_INTERFACE won't consult ARP to send local
+    // broadcast and multicast.
+    //
+    GateWay = Head->Dst;
 
+  } else if (GateWay == IP4_ALLZERO_ADDRESS) {
+    //
+    // Route the packet unless overrided, that is, GateWay isn't zero.
+    //
+    if (IpInstance == NULL) {
+      CacheEntry = Ip4Route (IpSb->DefaultRouteTable, Head->Dst, Head->Src);
     } else {
-      //
-      // Consult the route table to route the packet
-      //
-      if (IpInstance == NULL) {
-        CacheEntry = Ip4Route (IpSb->DefaultRouteTable, Head->Dst, Head->Src);
-      } else {
-        CacheEntry = Ip4Route (IpInstance->RouteTable, Head->Dst, Head->Src);
-      }
-
-      if (CacheEntry == NULL) {
-        return EFI_NOT_FOUND;
-      }
+      CacheEntry = Ip4Route (IpInstance->RouteTable, Head->Dst, Head->Src);
+    }
 
-      GateWay = CacheEntry->NextHop;
-      Ip4FreeRouteCacheEntry (CacheEntry);
+    if (CacheEntry == NULL) {
+      return EFI_NOT_FOUND;
     }
+
+    GateWay = CacheEntry->NextHop;
+    Ip4FreeRouteCacheEntry (CacheEntry);
   }
 
   //
-- 
2.39.2