64,66c64,66
< fetchDelay(p->fetch_delay), wbDelay(p->wb_delay),
< fetchCompDelay(p->fetch_comp_delay), wbCompDelay(p->wb_comp_delay),
< rxWriteDelay(p->rx_write_delay), txReadDelay(p->tx_read_delay),
---
> fetchDelay(p->fetch_delay), wbDelay(p->wb_delay),
> fetchCompDelay(p->fetch_comp_delay), wbCompDelay(p->wb_comp_delay),
> rxWriteDelay(p->rx_write_delay), txReadDelay(p->tx_read_delay),
870d869
<
871a871
>
898c898
< assert(!wbDelayEvent.scheduled());
---
> assert(!wbDelayEvent.scheduled());
902c902
<
---
>
914c914
<
---
>
923c923
<
---
>
965d964
<
966a966
>
975c975
<
---
>
1061c1061
<
---
>
1195c1195
< : DescCache<RxDesc>(i, n, s), pktDone(false), splitCount(0),
---
> : DescCache<RxDesc>(i, n, s), pktDone(false), splitCount(0),
1263c1263
<
---
>
1266c1266
< hdr_len = igbe->regs.rctl.lpe() ? igbe->regs.srrctl.hdrLen() : 0;
---
> hdr_len = igbe->regs.rctl.lpe() ? igbe->regs.srrctl.hdrLen() : 0;
1305c1305
<
---
>
1434c1434
< desc->adv_wb.vlan_tag = htole(0);
---
> desc->adv_wb.vlan_tag = htole(0);
1517c1517
<
---
>
1564c1564
<
---
>
1572c1572
< DPRINTF(EthernetDesc, "Descriptor upper: %#x lower: %#X\n",
---
> DPRINTF(EthernetDesc, "Descriptor upper: %#x lower: %#X\n",
1575c1575
<
---
>
1579c1579
< // setup all the TSO variables, they'll be ignored if we don't use
---
> // setup all the TSO variables, they'll be ignored if we don't use
1610c1610
< if (!useTso && TxdOp::isType(desc, TxdOp::TXD_ADVDATA) &&
---
> if (!useTso && TxdOp::isType(desc, TxdOp::TXD_ADVDATA) &&
1613c1613
< "hdrlen: %d mss: %d paylen %d\n",
---
> "hdrlen: %d mss: %d paylen %d\n",
1666c1666
<
---
>
1679c1679
< if (tsoPktHasHeader)
---
> if (tsoPktHasHeader)
1684c1684
< TxdOp::getLen(desc) - tsoDescBytesUsed);
---
> TxdOp::getLen(desc) - tsoDescBytesUsed);
1686c1686
< tsoCopyBytes + (tsoPktHasHeader ? 0 : tsoHeaderLen);
---
> tsoCopyBytes + (tsoPktHasHeader ? 0 : tsoHeaderLen);
1719c1719
<
---
>
1731c1731
<
---
>
1780d1779
<
1783c1782,1783
< if ((!TxdOp::eop(desc) && !useTso) ||
---
>
> if ((!TxdOp::eop(desc) && !useTso) ||
1828,1829c1828,1829
< ip->len(pktPtr->length - EthPtr(pktPtr)->size());
<
---
> ip->len(pktPtr->length - EthPtr(pktPtr)->size());
>
1948c1948
< IGbE::TxDescCache::actionAfterWb()
---
> IGbE::TxDescCache::actionAfterWb()
1953c1953
< if (completionEnabled) {
---
> if (completionEnabled) {