Only use triv links if no bw/latency.

profile/profile.py

@@ -481,19 +481,20 @@ clientvars.addVariable("AGGREGATES"," ".join(sorted(aggNodes.keys())))
 
 
 def applyGenericNetworkSettings(lanlink,bandwidth=0,latency=0):
-    if params.trivialOk is True:
-        lanlink.trivial_ok = True
-    else:
-        lanlink.trivial_ok = False
     if bandwidth > 0 or latency > 0:
         if bandwidth > 0:
             lanlink.bandwidth = bandwidth
         if latency > 0:
             lanlink.latency = latency
-    elif params.bestEffort is True:
-        lanlink.best_effort = True
     else:
-        lanlink.best_effort = False
+        if params.bestEffort is True:
+            lanlink.best_effort = True
+        else:
+            lanlink.best_effort = False
+        if params.trivialOk is True:
+            lanlink.trivial_ok = True
+        else:
+            lanlink.trivial_ok = False
     if params.multiplex is True:
         lanlink.link_multiplexing = True
     else: