From nobody Tue Sep 03 10:26:50 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 4Wyhcp4mggz5MkWF; Tue, 03 Sep 2024 10:26:50 +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 4Wyhcp29gzz4rpv; Tue, 3 Sep 2024 10:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725359210; 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=0zpUAu+ymUwSwvLxTkFzfrUKGJgEZ1kSEfnWQG6BvRk=; b=CqCQ+L1H8lvs+IuQW0e3bXeO5h9G1UA3KTzkfxIs92CJKXGbK2PkPb8I7RVehmhfFeLPfo 8S4KPuR+lOo0g9EI1h2rd6IYuHrXl5MNYgErtbmnU0adwy73SS1naUHFsqP4m69fHNIoUp djiC/iuxPMNZlFSlACn702/sM8Pif6J7696GsE6RgcjZpF1t7kvqXYMNqt3UbSkXaK5wBL I+aybnaXmqf9x8BdbefYk7lf0ItW5YJYaHcpA1Nvmhv7SEUR5v9FgKeNE88gkYJ/fb0cA8 Z0s8MXdyT28bMaDWrl4w4/CzIv75SGDIR/e738+gMdNs+VNyaISHuhP2NNtSRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359210; a=rsa-sha256; cv=none; b=NUKFDm6hqZwURnPe9bi2BZTIK8iTtNv5bO79vfvkpIqvB5fbf4nD9tsN2CLFDMKBHLbEtr 2J824sDNvwdRnaQ3YOaz0i+CsoyLG88ICRvCBsxSD52qf8dZwTqAIo5mEnUpcqVpXZb7aR oiqoTpx9yv99eNj+hA6U2ZuvlY+K4XO+tKwyhA9SsWZwl/TQuePeouMY46uuuovWFSRC/w YVgkwrQ71RB4mmaGN0HDmzX3gCnanCfuYFTA0H42w+9olvPJnaGtpWR60LMbqmi1/Zx6vV zfe+l8ADDr/FPqZhWT/nKCcDgxJhAWnDvRusAmG06t/lPlexHSPQt28mSzm6iQ== 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=1725359210; 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=0zpUAu+ymUwSwvLxTkFzfrUKGJgEZ1kSEfnWQG6BvRk=; b=emBwxy5IvlZHzI4UiDUqC+9TOLuWOeeNrwkKHTlidfrTTQQaacT4rZQ3gpYZY9+ydwC9Ez WopGn6EYLezAJ0kbjxDEs8KAHLpEbmB9EA3zjhevNHXm7y1atG6TupS+aMo6ACXroF8SKE VcNc9F/qazRYSl1N6GkXHLybIG4h+yggQvaHJOXkT2503Az/VWegNf0ocPHkuPzlLp9yNL /TM8On7txgCHX4zydbiabrmifdZMnl3h5m060mJN15ZqWyNaO4aR/D1VuKce2KeyzzIzVg iivLYKHBcemvV4sWjuXO9C9d9jGQX2cfFqnqHSWBLznCMgMw3jKOHTsqgwMtrw== 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 4Wyhcp1gPhzcxl; Tue, 3 Sep 2024 10:26:50 +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 483AQoMc009012; Tue, 3 Sep 2024 10:26:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQoVE009009; Tue, 3 Sep 2024 10:26:50 GMT (envelope-from git) Date: Tue, 3 Sep 2024 10:26:50 GMT Message-Id: <202409031026.483AQoVE009009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 07b16b1e2aea - main - 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/main X-Git-Reftype: branch X-Git-Commit: 07b16b1e2aeab0b30f68a013de31a4c322a61246 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=07b16b1e2aeab0b30f68a013de31a4c322a61246 commit 07b16b1e2aeab0b30f68a013de31a4c322a61246 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:19 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-03 10:25:19 +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 --- 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 a30db9173383..774298d4a53a 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -509,11 +509,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++)