1 files changed, 21 insertions, 40 deletions

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
index ee54dc2c5..77444204e 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
@@ -82,8 +82,7 @@ GarnetNetwork::init()
         m_ni_ptr_vector.push_back(ni);
     }
 
-    // false because this isn't a reconfiguration :
-    m_topology_ptr->createLinks(this, false);
+    m_topology_ptr->createLinks(this);
 }
 
 GarnetNetwork::~GarnetNetwork()
@@ -112,69 +111,51 @@ GarnetNetwork::reset()
 void
 GarnetNetwork::makeInLink(NodeID src, SwitchID dest, BasicLink* link, 
                           LinkDirection direction, 
-                          const NetDest& routing_table_entry, 
-                          bool isReconfiguration)
+                          const NetDest& routing_table_entry)
 {
     assert(src < m_nodes);
 
     GarnetExtLink* garnet_link = safe_cast<GarnetExtLink*>(link);
+    NetworkLink *net_link = garnet_link->m_network_links[direction];
 
-    if (!isReconfiguration) {
-        NetworkLink *net_link = garnet_link->m_network_links[direction];
-        net_link->init_net_ptr(this);
-        m_link_ptr_vector.push_back(net_link);
-        m_router_ptr_vector[dest]->addInPort(net_link);
-        m_ni_ptr_vector[src]->addOutPort(net_link);
-    }         else {
-        fatal("Fatal Error:: Reconfiguration not allowed here");
-        // do nothing
-    }
+    net_link->init_net_ptr(this);
+    m_link_ptr_vector.push_back(net_link);
+    m_router_ptr_vector[dest]->addInPort(net_link);
+    m_ni_ptr_vector[src]->addOutPort(net_link);
 }
 
 void
 GarnetNetwork::makeOutLink(SwitchID src, NodeID dest, BasicLink* link, 
                            LinkDirection direction, 
-                           const NetDest& routing_table_entry, 
-                           bool isReconfiguration)
+                           const NetDest& routing_table_entry)
 {
     assert(dest < m_nodes);
     assert(src < m_router_ptr_vector.size());
     assert(m_router_ptr_vector[src] != NULL);
 
     GarnetExtLink* garnet_link = safe_cast<GarnetExtLink*>(link);
+    NetworkLink *net_link = garnet_link->m_network_links[direction];
 
-    if (!isReconfiguration) {
-        NetworkLink *net_link = garnet_link->m_network_links[direction];
-        net_link->init_net_ptr(this);
-        m_link_ptr_vector.push_back(net_link);
-        m_router_ptr_vector[src]->addOutPort(net_link, routing_table_entry,
-                                             link->m_weight);
-        m_ni_ptr_vector[dest]->addInPort(net_link);
-    }         else {
-        fatal("Fatal Error:: Reconfiguration not allowed here");
-        //do nothing
-    }
+    net_link->init_net_ptr(this);
+    m_link_ptr_vector.push_back(net_link);
+    m_router_ptr_vector[src]->addOutPort(net_link, routing_table_entry,
+                                         link->m_weight);
+    m_ni_ptr_vector[dest]->addInPort(net_link);
 }
 
 void
 GarnetNetwork::makeInternalLink(SwitchID src, SwitchID dest, BasicLink* link,
                                 LinkDirection direction, 
-                                const NetDest& routing_table_entry, 
-                                bool isReconfiguration)
+                                const NetDest& routing_table_entry)
 {
     GarnetIntLink* garnet_link = safe_cast<GarnetIntLink*>(link);
+    NetworkLink *net_link = garnet_link->m_network_links[direction];
 
-    if (!isReconfiguration) {
-        NetworkLink *net_link = garnet_link->m_network_links[direction];
-        net_link->init_net_ptr(this);
-        m_link_ptr_vector.push_back(net_link);
-        m_router_ptr_vector[dest]->addInPort(net_link);
-        m_router_ptr_vector[src]->addOutPort(net_link, routing_table_entry,
-                                             link->m_weight);
-    }         else {
-        fatal("Fatal Error:: Reconfiguration not allowed here");
-        // do nothing
-    }
+    net_link->init_net_ptr(this);
+    m_link_ptr_vector.push_back(net_link);
+    m_router_ptr_vector[dest]->addInPort(net_link);
+    m_router_ptr_vector[src]->addOutPort(net_link, routing_table_entry,
+                                         link->m_weight);
 
 }