From nobody Thu May 02 13:26:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VVZTf1Dm0z5JJfk; Thu, 2 May 2024 13:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VVZTd4TKlz49xp; Thu, 2 May 2024 13:26:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714656405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uqWdpbwzLhLMVS4Ela/CBdqR5OdEc3qMtT1e9Ia11FQ=; b=AixGHng5wWxWipl9QCTcbpOwVEaud1HWplqaPh303QRHjlvEowXufhXImZveN4ebaIyfpQ lWcxD0O+CJSGIY4pTzOdRC60Srfsjbjjwbjfjpx2x/0jon1Lr2pHCbONnP0wxALwt6TYD0 voszDFXI0BHfbFfYwV9Fpe2MPKiNsTl7sK2xGw7LglwoV6vEneexCeX3BU9IRkByx/5WYQ G88doG9WhMU8DawQk/ronwIfLR5WMP6OCBOZyRktq9iw4pi+I+mqg8JhhYH69K5AZ0Kb1h BmWAMvXPrS+Mc6hSbf+tgt9p7hvLCHafsrryFrb/CTvaMf9BP8CPhOTZjg9saA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714656405; a=rsa-sha256; cv=none; b=T79YQuh9/ZdxjvLz/Wv4G7C6WvNgSu6map7x3mcG+XS2Vmeth1LLRx+aBXvU5LvgK/PbSb PdnB/nZhYP8PIIoObZCl3/8L58K7amXeyFNf1UE6b3nAcpBOFOQ4Xuc0yryYhBIO9RUrWE 8H02fkJPByO4LpPGTDqZr/9NCl7jUdh6wSwx01OzzqLmjnPARSBLBcVMdjUmt7W2tXcJAM G/Xy/c+G2qpXcuhevB3xZpc17JQdesJxSqTLZAWKo7m3If9BHy5u+k1tGvanNRh6NfuOiH HxdKw6KzJpeB8iJVW4EMb2yoABY22/IC/xGnnASKqyynq5rNtRXwphtD9SeGCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714656405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uqWdpbwzLhLMVS4Ela/CBdqR5OdEc3qMtT1e9Ia11FQ=; b=ZHy/Iwrcd+0UuNEl7fL5imF9ncLdO/7CvA1jTRa7tNgkZtQRLLzuIna70PCgcAiordcvq/ eoXZKlcaWukX2Ov6I4gyLuVTZ7PyD0BVyfxo42fltNo+X7m6OXEnK0vsas4AeyHBPWQTca MTUNzPl4Dvh+uUcelxwP4wjiJZ9P6/IOpyUumAxvQg1cAKT4emvtODRSJNN783qUlyEKO8 kEPH2meG8EsImQZGau+iLal1TN4qAVwPmHkAFAWn4CeRvtL6K4sbhz/0SA/IARPmFNE5W4 CH3qa17unRXl77GwHVlZ2TrqOtAA5BQxsIxQJmQu00OlLbixZ9Dscv61dV2/vQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VVZTd43XDz14HP; Thu, 2 May 2024 13:26:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 442DQjgY080739; Thu, 2 May 2024 13:26:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 442DQjo7080736; Thu, 2 May 2024 13:26:45 GMT (envelope-from git) Date: Thu, 2 May 2024 13:26:45 GMT Message-Id: <202405021326.442DQjo7080736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: bff26fe7aa07 - stable/14 - wg: uma_zcreate() does not fail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bff26fe7aa07173729bff549a00cc355bc977baf Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bff26fe7aa07173729bff549a00cc355bc977baf commit bff26fe7aa07173729bff549a00cc355bc977baf Author: Mark Johnston AuthorDate: 2024-04-23 16:19:08 +0000 Commit: Mark Johnston CommitDate: 2024-05-02 13:25:08 +0000 wg: uma_zcreate() does not fail No functional change intended. MFC after: 1 week (cherry picked from commit b6a0ed7c78dd45937e404706620467bef61c308d) --- sys/dev/wg/if_wg.c | 6 +++--- sys/dev/wg/wg_cookie.c | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index bf4eef31c0b3..2c867956912a 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -2989,9 +2989,9 @@ wg_module_init(void) [PR_METHOD_REMOVE] = wg_prison_remove, }; - if ((wg_packet_zone = uma_zcreate("wg packet", sizeof(struct wg_packet), - NULL, NULL, NULL, NULL, 0, 0)) == NULL) - return (ENOMEM); + wg_packet_zone = uma_zcreate("wg packet", sizeof(struct wg_packet), + NULL, NULL, NULL, NULL, 0, 0); + ret = crypto_init(); if (ret != 0) return (ret); diff --git a/sys/dev/wg/wg_cookie.c b/sys/dev/wg/wg_cookie.c index 6ff9325c6613..80617d473471 100644 --- a/sys/dev/wg/wg_cookie.c +++ b/sys/dev/wg/wg_cookie.c @@ -85,9 +85,8 @@ static uma_zone_t ratelimit_zone; int cookie_init(void) { - if ((ratelimit_zone = uma_zcreate("wg ratelimit", - sizeof(struct ratelimit_entry), NULL, NULL, NULL, NULL, 0, 0)) == NULL) - return ENOMEM; + ratelimit_zone = uma_zcreate("wg ratelimit", + sizeof(struct ratelimit_entry), NULL, NULL, NULL, NULL, 0, 0); ratelimit_init(&ratelimit_v4); #ifdef INET6