1. Fixed issue when calculating timeout value in timeout function in MNP module.

2. Added and refine some comments.
3. Enable UefiPxeBc Module to accept all broadcast packets for UDP Read&Write interface.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6781 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
index 0945c646940d9cffbda5bb7802989a7c0d372d8f..0347dc7f1f4f8719e6aa835535afc3587bcaf96d 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
@@ -1042,9 +1042,12 @@ MnpCheckPacketTimeout (
 \r
       RxDataWrap = NET_LIST_USER_STRUCT (RxEntry, MNP_RXDATA_WRAP, WrapEntry);\r
 \r
-      if (RxDataWrap->TimeoutTick >= MNP_TIMEOUT_CHECK_INTERVAL) {\r
+      //\r
+      // TimeoutTick unit is ms, MNP_TIMEOUT_CHECK_INTERVAL unit is 100ns.\r
+      //\r
+      if (RxDataWrap->TimeoutTick >= (MNP_TIMEOUT_CHECK_INTERVAL / 10)) {\r
 \r
-        RxDataWrap->TimeoutTick -= MNP_TIMEOUT_CHECK_INTERVAL;\r
+        RxDataWrap->TimeoutTick -= (MNP_TIMEOUT_CHECK_INTERVAL / 10);\r
       } else {\r
         //\r
         // Drop the timeout packet.\r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
index 4c7a6fdc33aa961512c2061fef01a44f7d128e22..bda2b36c31f3dab96f2c459f1aa3d056834d531c 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
@@ -451,13 +451,16 @@ Udp4CheckTimeout (
       //\r
       Wrap = NET_LIST_USER_STRUCT (WrapEntry, UDP4_RXDATA_WRAP, Link);\r
 \r
-      if (Wrap->TimeoutTick <= UDP4_TIMEOUT_INTERVAL / 10) {\r
+      //\r
+      // TimeoutTick unit is ms, MNP_TIMEOUT_CHECK_INTERVAL unit is 100ns.\r
+      //\r
+      if (Wrap->TimeoutTick <= (UDP4_TIMEOUT_INTERVAL / 10)) {\r
         //\r
         // Remove this RxData if it timeouts.\r
         //\r
         Udp4RecycleRxDataWrap (NULL, (VOID *) Wrap);\r
       } else {\r
-        Wrap->TimeoutTick -= UDP4_TIMEOUT_INTERVAL / 10;\r
+        Wrap->TimeoutTick -= (UDP4_TIMEOUT_INTERVAL / 10);\r
       }\r
     }\r
   }\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
index 845b7c0fd67dfb652853967d699de10adbb9371b..218ec435718c6652e5b7281d23012aee72455b8b 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
@@ -318,7 +318,7 @@ PxeBcDriverBindingStart (
     goto ON_ERROR;\r
   }\r
   ZeroMem (&Private->Udp4CfgData, sizeof (EFI_UDP4_CONFIG_DATA));\r
-  Private->Udp4CfgData.AcceptBroadcast    = FALSE;\r
+  Private->Udp4CfgData.AcceptBroadcast    = TRUE;\r
   Private->Udp4CfgData.AcceptPromiscuous  = FALSE;\r
   Private->Udp4CfgData.AcceptAnyPort      = TRUE;\r
   Private->Udp4CfgData.AllowDuplicatePort = TRUE;\r