171c171
< Tick packetFinishTime = pkt->lastWordDelay + curTick();
---
> Tick packetFinishTime = curTick() + pkt->payloadDelay;
225c225
< pkt->firstWordDelay = pkt->lastWordDelay = 0;
---
> pkt->headerDelay = pkt->payloadDelay = 0;
304c304
< Tick packetFinishTime = pkt->lastWordDelay + curTick();
---
> Tick packetFinishTime = curTick() + pkt->payloadDelay;
430c430
< Tick packetFinishTime = pkt->lastWordDelay + curTick();
---
> Tick packetFinishTime = curTick() + pkt->payloadDelay;
611,612c611,612
< // @todo: Not setting first-word time
< pkt->lastWordDelay = response_latency;
---
> // @todo: Not setting header time
> pkt->payloadDelay = response_latency;
651,652c651,652
< // @todo: Not setting first-word time
< pkt->lastWordDelay = snoop_response_latency;
---
> // @todo: Not setting header time
> pkt->payloadDelay = snoop_response_latency;