From: Ali Saidi <saidi@eecs.umich.edu>
Date: Fri, 23 Jan 2009 22:19:47 +0000 (-0500)
Subject: IGbE: Fix two e1000 driver bugs that I missed before.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=37ffe52ca406405ad42f9444286a7d1deef29a9c;p=gem5.git

IGbE: Fix two e1000 driver bugs that I missed before.
---

diff --git a/src/dev/i8254xGBe.cc b/src/dev/i8254xGBe.cc
index cf6692fb4..d6a888b21 100644
--- a/src/dev/i8254xGBe.cc
+++ b/src/dev/i8254xGBe.cc
@@ -1108,6 +1108,7 @@ IGbE::RxDescCache::unserialize(Checkpoint *cp, const std::string &section)
 
 IGbE::TxDescCache::TxDescCache(IGbE *i, const std::string n, int s)
     : DescCache<TxDesc>(i,n, s), pktDone(false), isTcp(false), pktWaiting(false),
+       completionAddress(0), completionEnabled(false),
        useTso(false), pktEvent(this), headerEvent(this), nullEvent(this)
 
 {
@@ -1319,7 +1320,8 @@ IGbE::TxDescCache::pktComplete()
 
 
     if ((!TxdOp::eop(desc) && !useTso) || 
-            (pktPtr->length < ( tsoMss + tsoHeaderLen) && tsoTotalLen != tsoUsedLen)) {
+            (pktPtr->length < ( tsoMss + tsoHeaderLen) &&
+             tsoTotalLen != tsoUsedLen && useTso)) {
         assert(!useTso || (tsoDescBytesUsed == TxdOp::getLen(desc)));
         unusedCache.pop_front();
         usedCache.push_back(desc);