]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #16106 from yuwata/network-tc-ets
authorLennart Poettering <lennart@poettering.net>
Wed, 24 Jun 2020 17:04:43 +0000 (19:04 +0200)
committerGitHub <noreply@github.com>
Wed, 24 Jun 2020 17:04:43 +0000 (19:04 +0200)
network: tc: introduce ETS

1  2 
src/network/networkd-network.c

index 7fa359a5425cf34b9a3626f7a61a8b47c41bd17c,0e68b35e897c91c0326e1f206d9eaafe17b52745..8478fe8c9efabfc33a342bf41f86fe36b6ef770e
@@@ -512,6 -512,7 +512,7 @@@ int network_load_one(Manager *manager, 
                          "ControlledDelay\0"
                          "DeficitRoundRobinScheduler\0"
                          "DeficitRoundRobinSchedulerClass\0"
+                         "EnhancedTransmissionSelection\0"
                          "FairQueueing\0"
                          "FairQueueingControlledDelay\0"
                          "GenericRandomEarlyDetection\0"
@@@ -1268,9 -1269,15 +1269,9 @@@ int config_parse_dnssec_negative_trust_
                          continue;
                  }
  
 -                r = set_ensure_allocated(&n->dnssec_negative_trust_anchors, &dns_name_hash_ops);
 +                r = set_ensure_consume(&n->dnssec_negative_trust_anchors, &dns_name_hash_ops, TAKE_PTR(w));
                  if (r < 0)
                          return log_oom();
 -
 -                r = set_put(n->dnssec_negative_trust_anchors, w);
 -                if (r < 0)
 -                        return log_oom();
 -                if (r > 0)
 -                        w = NULL;
          }
  
          return 0;