From nobody Mon Sep 30 04:45:11 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 4XH7m74S3cz5XkKH; Mon, 30 Sep 2024 04:45:11 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7m72Fkyz4DkQ; Mon, 30 Sep 2024 04:45:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671511; 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=CMQxlmdjk8A8Z6Ds4gvEu5q0jMENClFZ2kzKaQOuv+k=; b=Nlo9TI4e64WFh47WGnDZCjubxDhsZfHDzLwWF60hc1VVZPw8tVC47TPChcxRql6G5koM7N 4xzlWfu0n87UiEknwoYdX00J+6yjbgb0b1AqJotfd1gyRRFP8eETM/e4s2htCzGhJE1eYq ZAbCyw8mWuKYSx2WKdqvZvj9+U5kb3u7wM6GZLp+ap+HR73wJornrocgaTleoxNAA+xO4n Pq6hW7BWRuSziq0HwpxQLtIXrzU6mecq2IshpVp1qjiXW6ZGvS82obzfIa7tN8czu8Sn9Y NZRAMwTbsHzr7DA8xNNS5eOCLXy1kWCHxYBOojGfMLV7nM7v+fRTiKS8+TE8xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671511; 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=CMQxlmdjk8A8Z6Ds4gvEu5q0jMENClFZ2kzKaQOuv+k=; b=dj1wzpy4JOuoZ2umnqvrIZwtU08YzdTQSoko56H6c0B3Evi5nWeh7dWf+OHtBkBIQSd1Na nZ9e6et68rLywmMR2ShLP09Ohz2TnGE1/6kTT5XNAF0QgWxsPGtgaTMfAKdxa1E8qRRF8Z CCM4SWrgG3gtv1g8R+zLfHYcEROTGvnUydfF2BmpVVafIuEc9tbuPbd+LsG3K1vhX7ivEz ZtsYMb4YuZA/D1Wz5l6YJpwHiVJRJaeMPT4RlcMoXHfGnHdVwR0Mi2II1nFsaXv2x6rjor SOoS/a741FeLtJWdqGriBkiYnJjY4U+FVkTqyXvsd5OxY+sR8R3rzbhzYZyf2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671511; a=rsa-sha256; cv=none; b=qzSuNYeFOSWOFf0KVvyrhSzY2jCUbe6QPlRKkI6FkkvxjUbww0d260L26K0UvSFO7LQk7u 25VLlNfvJmdvu4QkOa4+qscVMPtaqd2+vmbtU4s8q7WFiuFHMWis1s+RDhPmWGUfjpsxnc By8YlpF1DkSdQCqn6ngzJQDc1iIy2zd01TchtqXNMk26CUgIVygan0FzbSrsKHixbDZUln WWTMCeu9HQqDUXMn4eCx1jluwWwwEg++phhUJUtzow6c+Y8VdilmtUxcjPEyCtJTt+y95o IRKQ0xcRwhh7iGYHezjpJpJ1KmDRwQm4mL/C3haE15wnr+IEblV4fEpXS57FpQ== 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 4XH7m71kTBzf2B; Mon, 30 Sep 2024 04:45:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jB1i086309; Mon, 30 Sep 2024 04:45:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jB64086306; Mon, 30 Sep 2024 04:45:11 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:11 GMT Message-Id: <202409300445.48U4jB64086306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 67971181687f - stable/14 - if_vlan: Stop checking for failures from malloc(M_WAITOK) 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 67971181687f0475dcf72b42d065364efea96251 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=67971181687f0475dcf72b42d065364efea96251 commit 67971181687f0475dcf72b42d065364efea96251 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:19 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:15 +0000 if_vlan: Stop checking for failures from malloc(M_WAITOK) Fixes: b08d611de835 fix vlan locking to permit sx acquisition in ioctl calls MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 07b16b1e2aeab0b30f68a013de31a4c322a61246) --- sys/net/if_vlan.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 59eb41956ad4..206d46e7f9be 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -508,11 +508,6 @@ vlan_growhash(struct ifvlantrunk *trunk, int howmuch) return; hash2 = malloc(sizeof(struct ifvlanhead) * n2, M_VLAN, M_WAITOK); - if (hash2 == NULL) { - printf("%s: out of memory -- hash size not changed\n", - __func__); - return; /* We can live with the old hash table */ - } for (j = 0; j < n2; j++) CK_SLIST_INIT(&hash2[j]); for (i = 0; i < n; i++)