Import ArpDxe, Dhcp4Dxe, Ip4Dxe, Mtftp4Dxe, PxeBcDxe and PxeDhcp4Dxe.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / MnpDxe / MnpConfig.c

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
index 5a648f5ffc8e9a7b348e32d7cc7a93b280b41bb9..83fc3c6ae48e9a5ec202ee2e8b3b1c7f580854e0 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
@@ -139,7 +139,7 @@ MnpAddFreeNbuf (
 \r
   for (Index = 0; Index < Count; Index++) {\r
 \r
-    Nbuf = NetbufAlloc (MnpServiceData->BufferLength);\r
+    Nbuf = NetbufAlloc (MnpServiceData->BufferLength + MnpServiceData->PaddingSize);\r
     if (Nbuf == NULL) {\r
 \r
       MNP_DEBUG_ERROR (("MnpAddFreeNbuf: NetBufAlloc failed.\n"));\r
@@ -147,6 +147,14 @@ MnpAddFreeNbuf (
       break;\r
     }\r
 \r
+    if (MnpServiceData->PaddingSize > 0) {\r
+      //\r
+      // Pad padding bytes before the media header\r
+      //\r
+      NetbufAllocSpace (Nbuf, MnpServiceData->PaddingSize, NET_BUF_TAIL);\r
+      NetbufTrim (Nbuf, MnpServiceData->PaddingSize, NET_BUF_HEAD);\r
+    }\r
+\r
     NetbufQueAppend (&MnpServiceData->FreeNbufQue, Nbuf);\r
   }\r
 \r
@@ -328,6 +336,12 @@ MnpInitializeServiceData (
   //\r
   MnpServiceData->BufferLength = MnpServiceData->Mtu + SnpMode->MediaHeaderSize + NET_ETHER_FCS_SIZE;\r
 \r
+  //\r
+  // Make sure the protocol headers immediately following the media header \r
+  // 4-byte aligned\r
+  //\r
+  MnpServiceData->PaddingSize = (4 - SnpMode->MediaHeaderSize) & 0x3;\r
+\r
   //\r
   // Initialize the FreeNetBufQue and pre-allocate some NET_BUFs.\r
   //\r