Update MnpDxe to deliver VLAN tagged packet even when there is no VLAN is configured...

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

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
index 28349bc438df61317c1480e5fc782e3afd94d551..1aa3207ea357d2d4ba6705e9d4c4e086ee7ca894 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
@@ -944,7 +944,14 @@ MnpReceivePacket (
   }\r
 \r
   VlanId = 0;\r
   }\r
 \r
   VlanId = 0;\r

-  IsVlanPacket = MnpRemoveVlanTag (MnpDeviceData, Nbuf, &VlanId);\r
+  if (MnpDeviceData->NumberOfVlan != 0) {\r
+    //\r
+    // VLAN is configured, remove the VLAN tag if any\r
+    //\r
+    IsVlanPacket = MnpRemoveVlanTag (MnpDeviceData, Nbuf, &VlanId);\r
+  } else {\r
+    IsVlanPacket = FALSE;\r
+  }\r

 \r
   MnpServiceData = MnpFindServiceData (MnpDeviceData, VlanId);\r
   if (MnpServiceData == NULL) {\r
 \r
   MnpServiceData = MnpFindServiceData (MnpDeviceData, VlanId);\r
   if (MnpServiceData == NULL) {\r