Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Sep 2024 05:08:04 GMT
From:      Zhenlei Huang <zlei@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 019abb5cf986 - stable/13 - if_vlan: Stop checking for failures from malloc(M_WAITOK)
Message-ID:  <202409300508.48U584YG024200@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by zlei:

URL: https://cgit.FreeBSD.org/src/commit/?id=019abb5cf986a851cef6aa65e5a39b4955649357

commit 019abb5cf986a851cef6aa65e5a39b4955649357
Author:     Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:19 +0000
Commit:     Zhenlei Huang <zlei@FreeBSD.org>
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++)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409300508.48U584YG024200>