projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dev-arm: Move GICv3 (Re)Ditributor address in Realview.py
[gem5.git]
/
src
/
dev
/
net
/
ethertap.hh
diff --git
a/src/dev/net/ethertap.hh
b/src/dev/net/ethertap.hh
index 9b4e175e1105aae7c659cd332d4bb94269b3ae49..5f59a390cda3d64a823134729defc0366c9dec7f 100644
(file)
--- a/
src/dev/net/ethertap.hh
+++ b/
src/dev/net/ethertap.hh
@@
-41,7
+41,6
@@
#include "base/pollevent.hh"
#include "config/use_tuntap.hh"
#include "dev/net/etherint.hh"
#include "base/pollevent.hh"
#include "config/use_tuntap.hh"
#include "dev/net/etherint.hh"
-#include "dev/net/etherobject.hh"
#include "dev/net/etherpkt.hh"
#if USE_TUNTAP
#include "dev/net/etherpkt.hh"
#if USE_TUNTAP
@@
-56,7
+55,7
@@
class TapEvent;
class EtherTapInt;
class TapEvent;
class EtherTapInt;
-class EtherTapBase : public
Ether
Object
+class EtherTapBase : public
Sim
Object
{
public:
typedef EtherTapBaseParams Params;
{
public:
typedef EtherTapBaseParams Params;
@@
-101,7
+100,8
@@
class EtherTapBase : public EtherObject
EtherTapInt *interface;
public:
EtherTapInt *interface;
public:
- EtherInt *getEthPort(const std::string &if_name, int idx) override;
+ Port &getPort(const std::string &if_name,
+ PortID idx=InvalidPortID) override;
bool recvSimulated(EthPacketPtr packet);
void sendSimulated(void *data, size_t len);
bool recvSimulated(EthPacketPtr packet);
void sendSimulated(void *data, size_t len);