Merge branch 'device-queue'
authorRoni Häcki <roni.haecki@inf.ethz.ch>
Tue, 15 Nov 2016 14:39:31 +0000 (15:39 +0100)
committerRoni Häcki <roni.haecki@inf.ethz.ch>
Tue, 15 Nov 2016 14:39:31 +0000 (15:39 +0100)
Signed-off-by: Roni Häcki <roni.haecki@inf.ethz.ch>

1  2 
devices/Hakefile
errors/errno.fugu
lib/net_device_manager/Hakefile
usr/skb/programs/device_db.pl

Simple merge
Simple merge
  
  [ build library { target = "net_device_manager",
                    cFiles = [ "port_service_impl.c", "device_manager.c",
-                   "soft_filt_cl_impl.c", "e10k_filt_cl_impl.c", "portalloc.c" ],
+                   "soft_filt_cl_impl.c", "e10k_filt_cl_impl.c", 
+                   "sfn5122f_filt_cl_impl.c", "portalloc.c" ],
                    flounderBindings = [ "net_soft_filters", "net_ports",
-                                        "e10k" ],
+                                        "e10k", "sfn5122f" ],
 -                  addLibraries = [ "contmng", "bfdmuxtools", "trace"
 +                  flounderExtraBindings = [ ("net_soft_filters", ["rpcclient"])],
 +                  addLibraries = [ "bfdmuxtools", "trace"
  -- try to get rid of "lwip" as it is only used for hton[s/l]
                      , "lwip"
                    ]
Simple merge