Deleted Added
sdiff udiff text old ( 11320:42ecb523c64a ) new ( 11701:5e7599457b97 )
full compact
1/*
2 * Copyright (c) 2006 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 1757 unchanged lines hidden (view full) ---

1766 DPRINTF(EthernetDesc, "TxDescriptor data d1: %#llx d2: %#llx\n",
1767 desc->d1, desc->d2);
1768
1769 // Set the length of the data in the EtherPacket
1770 if (useTso) {
1771 DPRINTF(EthernetDesc, "TSO: use: %d hdrlen: %d mss: %d total: %d "
1772 "used: %d loaded hdr: %d\n", useTso, tsoHeaderLen, tsoMss,
1773 tsoTotalLen, tsoUsedLen, tsoLoadedHeader);
1774 pktPtr->simLength += tsoCopyBytes;
1775 pktPtr->length += tsoCopyBytes;
1776 tsoUsedLen += tsoCopyBytes;
1777 DPRINTF(EthernetDesc, "TSO: descBytesUsed: %d copyBytes: %d\n",
1778 tsoDescBytesUsed, tsoCopyBytes);
1779 } else {
1780 pktPtr->simLength += TxdOp::getLen(desc);
1781 pktPtr->length += TxdOp::getLen(desc);
1782 }
1783
1784
1785
1786 if ((!TxdOp::eop(desc) && !useTso) ||
1787 (pktPtr->length < ( tsoMss + tsoHeaderLen) &&
1788 tsoTotalLen != tsoUsedLen && useTso)) {
1789 assert(!useTso || (tsoDescBytesUsed == TxdOp::getLen(desc)));
1790 igbe->anDq("TXS", annUnusedCacheQ);

--- 726 unchanged lines hidden (view full) ---

2517 UNSERIALIZE_ARRAY(flash,iGbReg::EEPROM_SIZE);
2518
2519 rxFifo.unserialize("rxfifo", cp);
2520 txFifo.unserialize("txfifo", cp);
2521
2522 bool txPktExists;
2523 UNSERIALIZE_SCALAR(txPktExists);
2524 if (txPktExists) {
2525 txPacket = std::make_shared();
2526 txPacket->unserialize("txpacket", cp);
2527 }
2528
2529 rxTick = true;
2530 txTick = true;
2531 txFifoTick = true;
2532
2533 Tick rdtr_time, radv_time, tidv_time, tadv_time, inter_time;

--- 32 unchanged lines hidden ---