net: adding another missing dependency
authorAdam Turowski <adam.turowski@inf.ethz.ch>
Wed, 25 Jan 2017 10:30:56 +0000 (11:30 +0100)
committerAdam Turowski <adam.turowski@inf.ethz.ch>
Wed, 25 Jan 2017 10:30:56 +0000 (11:30 +0100)
Signed-off-by: Adam Turowski <adam.turowski@inf.ethz.ch>

lib/lwip/Hakefile
lib/lwip/src/barrelfish/idc_barrelfish.c
lib/lwip/src/core/init.c
lib/net_device_manager/Hakefile

index c5ca2ec..2b06641 100644 (file)
@@ -26,6 +26,6 @@ in
                     addCFlags =  [ "-Wno-redundant-decls",
                                    "-DBF_LWIP_CHAN_SUPPORT" ],
                     addIncludes = [ "src/barrelfish" ],
-                    addLibraries = [ "contmng", "procon"]
+                    addLibraries = [ "netbench", "procon"]
                   }
   ]
index 05cd522..5f066b9 100644 (file)
@@ -21,7 +21,6 @@
 #include <assert.h>
 #include <trace/trace.h>
 #include <trace_definitions/trace_defs.h>
-#include <contmng/contmng.h>
 #include <netbench/netbench.h>
 #include <procon/procon.h>
 #include "lwip/pbuf.h"
index d68f032..986747a 100644 (file)
@@ -522,7 +522,6 @@ uint8_t lwip_driver_benchmark_state(int direction, uint64_t *delta,
    return get_driver_benchmark_state(direction, delta, cl);
 }
 
-#include <contmng/contmng.h>
 #define FREE_SLOT_THRESHOLD    100
 int is_lwip_loaded(void)
 {
@@ -557,10 +556,6 @@ int is_lwip_loaded(void)
     // Check for load the driver itself
     uint64_t tx_slots_left = idc_check_driver_load();
 
-    if (tx_slots_left < (MAX_QUEUE_SIZE + 10)) {
-//        return 5;
-    }
-
     // Everything is great!
     return 0;
 }                               // end function: is_lwip_loaded?
@@ -639,4 +634,3 @@ bool is_hw_feature_enabled(int hw_feature)
     // activeness should be decided
     return false;
 } // end function: is_hw_feature_enabled
-
index 48e5d3b..959e786 100644 (file)
@@ -17,7 +17,7 @@
                   flounderBindings = [ "net_soft_filters", "net_ports",
                                        "e10k", "sfn5122f" ],
                   flounderExtraBindings = [ ("net_soft_filters", ["rpcclient"])],
-                  addLibraries = [ "bfdmuxtools", "trace"
+                  addLibraries = [ "bfdmuxtools", "trace", "contmng"
 -- try to get rid of "lwip" as it is only used for hton[s/l]
                     , "lwip"
                   ]