From nobody Mon Sep 30 05:08:04 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 4XH8GX5PYMz5Xlll; Mon, 30 Sep 2024 05:08:04 +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 4XH8GX2tszz4WgH; Mon, 30 Sep 2024 05:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672884; 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=jo8CaBkI5Mm4UA2nXKA2+FHujIOnza2Esd7i9/VzwQ8=; b=cs2SsGtL6mSeM9jGcktrKGpO8LkckxizzJ/Casd48Kl2FuGi6mC4fVXqntLHqZ6CWpFhkh gMKTPDnQ0lJcKNfLLgUzz83hewL3cU9CqHOTba42J57kBHZzAGNBDGLplzLf4q9QZPx5nr UO950Y4vT3+CA2VH3RTLrqPSA7PZ46gKNxfBScIRjB743AGX4rA/eSU+yP9tzwcGi/wUuG 3wNkVHiqfUiDFgRu0LTqcHAj9eRqSUe8zV9QsGep4lemSuEjLVJ3+HBYcga0a8NXX0r6wX D9h6XnE3v7C6RqghDniWRmvv7P0l7QK9/fvMmJDsLuIdzVjZXlit5TXbFLp9JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672884; 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=jo8CaBkI5Mm4UA2nXKA2+FHujIOnza2Esd7i9/VzwQ8=; b=HDCuyDZidh3/IG98Ozf3OsWlqk0wtVO1/HjPypUYIvvERp0vula8yWYERJitS44UEpoYr/ prguXc7LP7FRKPT4tn9MPNXRAPVJS0MsCksj6OdFeCQ54J45UkBQXIkA3b7lsXVp/cMMqw YwzHMvJ1QqNCybi3Pokdq9TdYkyj62qcPENp6eoMR9dGEEuEV02Rwp2U7TnMOWrZ8BKrfE aJUDKo4B1/RGueyH14kFp7eenHyzRsPf+HO/tG9zB+oXLiBIzTovCLAdYGtb5aw2COXArm r9lf9vOcRkkVdPqC4+VZPP4tgzdf4ludq3FnOAn73Aw3aaNe/on2Z+Sn2ydbSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672884; a=rsa-sha256; cv=none; b=gqpEngtlUsZ3zJ1mt8FpclRHx7AfMxe6rm/MYk+iY5yl1Zd5X5ueOdDNQPlEINynIwm5Gd fvKJd4ltDfXgxqwT5V6BjtttMp/BwJn/6cDuBFksNPKxZ5Qn4gV/ZOa649QimvtExjjSWW 1rZ16gKuGdYs7a7RS7dbW8Sh+vpEZXDi98jDPDu+L8cBUFi/DrFZJ1M5faEwhyJ66k0fCP ikYCP0wueSV8OrZF6iFx1VRP/8Uitm/iD/cMLlyxMryTWkryyFhSjUTpFpTChQNi8xnhzI j+h+jiAcm4Q/z2WOR8dYmUsTx1MuJCo5zFrH4NwFx0pQhFc1mIISsiQSDfB82Q== 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 4XH8GX2QjHzftX; Mon, 30 Sep 2024 05:08:04 +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 48U584C7024203; Mon, 30 Sep 2024 05:08:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U584YG024200; Mon, 30 Sep 2024 05:08:04 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:04 GMT Message-Id: <202409300508.48U584YG024200@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: 019abb5cf986 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 019abb5cf986a851cef6aa65e5a39b4955649357 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=019abb5cf986a851cef6aa65e5a39b4955649357 commit 019abb5cf986a851cef6aa65e5a39b4955649357 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:19 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:30 +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) (cherry picked from commit 67971181687f0475dcf72b42d065364efea96251) --- 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 9d0e6ae66b31..976bda1f5ee4 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -465,11 +465,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++)