diff options
| author | Fu Siyuan <siyuan.fu@intel.com> | 2014-01-06 02:17:12 +0000 |
|---|---|---|
| committer | sfu5 <sfu5@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-01-06 02:17:12 +0000 |
| commit | 8ff272ee837ebdfba6b72ed3dcf5e7ab136d8af0 (patch) | |
| tree | 86f38fe15a245ea6bd1de9106d375136156ee2c1 /MdeModulePkg/Universal | |
| parent | ecec42044078d60fc517d3474c0ebf82d0f15633 (diff) | |
| download | edk2-8ff272ee837ebdfba6b72ed3dcf5e7ab136d8af0.zip edk2-8ff272ee837ebdfba6b72ed3dcf5e7ab136d8af0.tar.gz edk2-8ff272ee837ebdfba6b72ed3dcf5e7ab136d8af0.tar.bz2 | |
Fix “reconnect -r” ASSERT after VLAN configured.
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Zhang, Chao B <chao.b.zhang@intel.com>
Reviewed-by: Jin, Eric <eric.jin@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15048 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal')
| -rw-r--r-- | MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c index b8f61bf..7f03b84 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c +++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c @@ -1,7 +1,7 @@ /** @file
Implementation of Managed Network Protocol I/O functions.
-Copyright (c) 2005 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2014, 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
@@ -128,16 +128,13 @@ MnpBuildTxPacket ( MNP_DEVICE_DATA *MnpDerviceData;
MnpDerviceData = MnpServiceData->MnpDeviceData;
+
+ //
+ // Reserve space for vlan tag.
+ //
+ *PktBuf = MnpDerviceData->TxBuf + NET_VLAN_TAG_LEN;
+
if ((TxData->DestinationAddress == NULL) && (TxData->FragmentCount == 1)) {
- //
- // Reserve space for vlan tag,if necessary.
- //
- if (MnpServiceData->VlanId != 0) {
- *PktBuf = MnpDerviceData->TxBuf + NET_VLAN_TAG_LEN;
- } else {
- *PktBuf = MnpDerviceData->TxBuf;
- }
-
CopyMem (
*PktBuf,
TxData->FragmentTable[0].FragmentBuffer,
@@ -151,9 +148,8 @@ MnpBuildTxPacket ( // one fragment, copy the data into the packet buffer. Reserve the
// media header space if necessary.
//
- SnpMode = MnpDerviceData->Snp->Mode;
- DstPos = MnpDerviceData->TxBuf;
-
+ SnpMode = MnpDerviceData->Snp->Mode;
+ DstPos = *PktBuf;
*PktLen = 0;
if (TxData->DestinationAddress != NULL) {
//
@@ -177,9 +173,8 @@ MnpBuildTxPacket ( }
//
- // Set the buffer pointer and the buffer length.
+ // Set the buffer length.
//
- *PktBuf = MnpDerviceData->TxBuf;
*PktLen += TxData->DataLength + TxData->HeaderLength;
}
}
|