From: Susant Sahani <ssahani@vmware.com>
Date: Wed, 20 Jan 2021 11:56:44 +0000 (+0100)
Subject: network: ndisc - Use ordered_set_ensure_put
X-Git-Tag: v248-rc1~286^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b1fd1f55b327f34261d0b2275f5e92090dc3b60;p=thirdparty%2Fsystemd.git

network: ndisc - Use ordered_set_ensure_put
---

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 3f1837f5911..82de316bc3a 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -1544,11 +1544,9 @@ int config_parse_address_generation_type(
                 token->prefix = buffer.in6;
         }
 
-        r = ordered_set_ensure_allocated(&network->ipv6_tokens, &ipv6_token_hash_ops);
-        if (r < 0)
+        r = ordered_set_ensure_put(&network->ipv6_tokens, &ipv6_token_hash_ops, token);
+        if (r == -ENOMEM)
                 return log_oom();
-
-        r = ordered_set_put(network->ipv6_tokens, token);
         if (r == -EEXIST)
                 log_syntax(unit, LOG_DEBUG, filename, line, r,
                            "IPv6 token '%s' is duplicated, ignoring: %m", rvalue);