Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5

[gem5.git] / dev / etherbus.cc

diff --git a/dev/etherbus.cc b/dev/etherbus.cc
index fa1d842723cad462baaf9d746056ac17238c0593..82722383cf3820250012ab132db437ced4f90344 100644 (file)
--- a/dev/etherbus.cc
+++ b/dev/etherbus.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2002-2004 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,17 +30,17 @@
  * Device module for modelling an ethernet hub
  */
 
+#include <cmath>
 #include <deque>
 #include <string>
 #include <vector>
 
-#include <math.h>
-
+#include "base/trace.hh"
 #include "dev/etherbus.hh"
 #include "dev/etherdump.hh"
 #include "dev/etherint.hh"
 #include "dev/etherpkt.hh"
-#include "base/trace.hh"
+#include "sim/builder.hh"
 #include "sim/universe.hh"
 
 using namespace std;
@@ -81,7 +81,7 @@ EtherBus::reg(EtherInt *dev)
 { devlist.push_back(dev); }
 
 bool
-EtherBus::send(EtherInt *sndr, PacketPtr pkt)
+EtherBus::send(EtherInt *sndr, PacketPtr &pkt)
 {
     if (busy()) {
         DPRINTF(Ethernet, "ethernet packet not sent, bus busy\n", curTick);