From nobody Wed Apr 24 13:17:13 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 4VPffL0JNhz5HKrf; Wed, 24 Apr 2024 13:17:14 +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 4VPffK4YZZz4LXH; Wed, 24 Apr 2024 13:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964633; 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=BYx9mOH5/ypFOxAa/KVAben5Fu0zsyjHN+B0Sl2O010=; b=Gt+U0jj27EGQE2iI17T6NzUTTdhmUCC0edAXmYO1V3Sybr7fBt3tOFmiyyvlAmdo/35+hR KWAFA9Tgwu2TYpXRLXcJs/cTTzkxOD6Y2ypkCM0EZ+IYJK3ShbGTuUMpGO99a6pVE/zdGQ aigfoL+/Vjiq/fhBDN0EZB3Evnn2MDI9hxibaBdTmM5eRAbs+OdvpsWTr7R1LJCvv5kp/E Kl9OEO0ieGPR9wapZ8WQhbB4pxI9aigP+SQKEjWvjWEAJ+kGr8nAq5SHy3twZLoei3BdaU NXtty6/0W3eIqEWqyFYABmqM1bldqgUDo2E0DtZcz9shlaPAgjdKkidSOEYubA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713964633; a=rsa-sha256; cv=none; b=oCtyRlLhvEYcRzp4s89ucKigbhIRXfw5WqXVu6Fvp7DXpY/DlXIxrwj0z6Lz6tGx/vTnY6 Z4aHkzsckSDKqPkxOr/opvZVbKy9+JElMSpZTnBqTaj5fwIPwklvmYK/vyOAZxrWTW+yLy mIN+x9szwWQBJqevSvxF2DrXT9Bdw8dfk15RKZSvnHbUacFFRvDi3nAU+R/Cl1z3w4onuP 9BiMJyo5sZHvYBN7ibYwbG8boxcvhVl1nDwOEk2hbf0GtQg3XxUzT3jUEdbeHDRacJoX9j ZI2R+ZBVxHWno/AUHpbz0h7k0VlzUSnLOQhv7Nx2ydxL1K3faANRQwODJPm7Kw== 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=1713964633; 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=BYx9mOH5/ypFOxAa/KVAben5Fu0zsyjHN+B0Sl2O010=; b=akrus5bq0cyjrv4ZNeTrYMii5VPRq4S186jXslkSp7S+Dj3YBBluyUv+SNNjt2T9cJn75C Ubt7mOGMz5+r3RT2SvEgdHx2YfmqKSZ2Q97pRAQRT/n3JByYX6DCpMxnaMb42mv9KrDNsC u7my36IXAj1I4sfvRP4aK+k5ANQtUdiec+/U/D0BfK3isdpbrsCqxxUfnFcGO9KXKkE9CH St8GVmV/G253+Vjj947a3ZVcpFwlc7hgQNIif8MZHZu+Tk7k8yaBbQwr0aVPYfNqBGF5zJ s24aq6wHGYUoKM7HRTPoxqU0CkGq1bF56g3VGXHbAywptqNKs+rd3q0g+nElWw== 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 4VPffK45cFzH5m; Wed, 24 Apr 2024 13:17:13 +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 43ODHDLk053425; Wed, 24 Apr 2024 13:17:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODHD6K053422; Wed, 24 Apr 2024 13:17:13 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:17:13 GMT Message-Id: <202404241317.43ODHD6K053422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b6a0ed7c78dd - main - 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/main X-Git-Reftype: branch X-Git-Commit: b6a0ed7c78dd45937e404706620467bef61c308d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b6a0ed7c78dd45937e404706620467bef61c308d commit b6a0ed7c78dd45937e404706620467bef61c308d Author: Mark Johnston AuthorDate: 2024-04-23 16:19:08 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 12:45:40 +0000 wg: uma_zcreate() does not fail No functional change intended. MFC after: 1 week --- 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 57caa69bde3b..d0b75d5cbf4b 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -3135,9 +3135,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