Merging uefi-next/linaro-release into masterlinaro-uefi-2013.11

Signed-off-by: Steven Kinney <steven.kinney@linaro.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/OvmfPkg/VirtioNetDxe/SnpTransmit.c b/OvmfPkg/VirtioNetDxe/SnpTransmit.c
index ff922ca02..b2a364b96 100644
--- a/OvmfPkg/VirtioNetDxe/SnpTransmit.c
+++ b/OvmfPkg/VirtioNetDxe/SnpTransmit.c
@@ -127,15 +127,15 @@ VirtioNetTransmit (
       goto Exit;

     }

     Ptr = Buffer;

-    ASSERT (SIZE_OF_VNET (VhdrMac) <= sizeof (EFI_MAC_ADDRESS));

+    ASSERT (SIZE_OF_VNET (Mac) <= sizeof (EFI_MAC_ADDRESS));
 

-    CopyMem (Ptr, DestAddr, SIZE_OF_VNET (VhdrMac));

-    Ptr += SIZE_OF_VNET (VhdrMac);

+    CopyMem (Ptr, DestAddr, SIZE_OF_VNET (Mac));
+    Ptr += SIZE_OF_VNET (Mac);
 

     CopyMem (Ptr,

       (SrcAddr == NULL) ? &Dev->Snm.CurrentAddress : SrcAddr,

-      SIZE_OF_VNET (VhdrMac));

-    Ptr += SIZE_OF_VNET (VhdrMac);

+      SIZE_OF_VNET (Mac));
+    Ptr += SIZE_OF_VNET (Mac);
 

     *Ptr++ = (UINT8) (*Protocol >> 8);

     *Ptr++ = (UINT8) *Protocol;

@@ -161,7 +161,7 @@ VirtioNetTransmit (
   *Dev->TxRing.Avail.Idx = AvailIdx;

 

   MemoryFence ();

-  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrQueueNotify, VIRTIO_NET_Q_TX);

+  Status = Dev->VirtIo->SetQueueNotify (Dev->VirtIo, VIRTIO_NET_Q_TX);
 

 Exit:

   gBS->RestoreTPL (OldTpl);