From nobody Wed Oct 09 04:02:42 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 4XNfNy3yvYz5Ymp7; Wed, 09 Oct 2024 04:02:42 +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 4XNfNy3MRrz51Q3; Wed, 9 Oct 2024 04:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728446562; 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=AsAFT60ZR5MNvJU3s0cAX9M0Jfv5Tn5KEfuJ8ynWk7Y=; b=MsU6Z4TrChv3ZQj5qqgoNjcAGjyT4oq+Ge/fgORbtlG624Oau8pdyQir4xn4997NeuwyRJ kty/5ueq/zga7j4G6UZqMxOEFRifjKo6iCyIe0KKDnOl7uXYQsRKbYiCCMOpV0j4/2pY3B GCOmfLzodNl/IfRJFWsgNOn6PRfxLFOMgAS119lxYmzpgvYsgNiUbjEu3LX+L2Wzm23EH0 6VTUpQ1lhv8+aTwXmcSEeoU0THYVbimFr6RHL1dVTqd59ujx4kLq+QG0rXit0TCISZllHb lkToJi1FwIe63xXX0sg0Kj3mKCNlTp12BB61qf+6nHsB64X2LzF94rcl8aecIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728446562; 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=AsAFT60ZR5MNvJU3s0cAX9M0Jfv5Tn5KEfuJ8ynWk7Y=; b=GuRa8HrGkLPhM/LxHFxk6h9UEv8vNYQ2O7uZko6meB2lQXKJ0at6JMPNrlNNgNOrvglCa5 0IRPXrR8Q1eF7aQJXdKwbQokoXxeTDkVebYFc2+7c9Dmn+6/BPcTQhtxt+Xe5fd4Mpe7hl NuR9Onuaf8qNJP0hV1mn5qf/1hWnrUPvsqXv/xgrbuiI+PLOTQX5HG55H77OoOHyNY864M dRnIi7GMvGPEadG3Bb2MhQ0aEtL4/Y6ae450rqch8zCm2n+B3oT1+6UaHnpyQ1zmc/kewg NtkCh9AbW/XeuF9zritmAwMDkuFCbbjHDL7tvP2KU0YGvoqb9brae6WoQ7uv3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728446562; a=rsa-sha256; cv=none; b=B5TlEsFFXece07J0LyXtq1+KOyfWBZl0GxF5Xb41Ib2e+njhVzdbDDPqwlVKCxmuWgU3V6 l4UEu8TmggRC5+xJfa+GgqJiyeHDPo59t03b1H7pKz5/U5XKoBN78JHoH8MfYoX1sibiXU Kh/+s9Wuy6zpRMrPwsF62ykO7SCX+BWYUfXNuTrr1wjl+JpRezK4MqQ6KmG/zbUvwZ8g1d 2LXCn47H6IIzvC3FyfkJ6cwzFsiHWWdkHh0Y3wfdPtBWSqMXqvjNJNS05nlrkN9Cw2x4eE Mk6FXsHw/xRfkQrxwq9NGVRzlpcbqspX3YbxSES8lvvLocOk6ikPAvoaI753hA== 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 4XNfNy2ypCzyZP; Wed, 9 Oct 2024 04:02:42 +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 49942gpd091804; Wed, 9 Oct 2024 04:02:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49942g9G091801; Wed, 9 Oct 2024 04:02:42 GMT (envelope-from git) Date: Wed, 9 Oct 2024 04:02:42 GMT Message-Id: <202410090402.49942g9G091801@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: 86c8cbe788db - stable/13 - if_epair: Remove unneeded NULL check for the allocated ifnet 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: 86c8cbe788db4d2fd3eb32d92a66a72840665d1a Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=86c8cbe788db4d2fd3eb32d92a66a72840665d1a commit 86c8cbe788db4d2fd3eb32d92a66a72840665d1a Author: Zhenlei Huang AuthorDate: 2024-10-09 04:01:10 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-09 04:01:10 +0000 if_epair: Remove unneeded NULL check for the allocated ifnet This follows the recent MFC [1]. No functional change intended. This is a direct commit to stable/13. 1. f500e5c6c99b net: Remove unneeded NULL check for the allocated ifnet --- sys/net/if_epair.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c index e4b37f976a8c..9482b30251b7 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -553,11 +553,6 @@ epair_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) sca = malloc(sizeof(struct epair_softc), M_EPAIR, M_WAITOK | M_ZERO); sca->ifp = if_alloc(IFT_ETHER); sca->num_queues = epair_tasks.tasks; - if (sca->ifp == NULL) { - free(sca, M_EPAIR); - ifc_free_unit(ifc, unit); - return (ENOSPC); - } sca->queues = mallocarray(sca->num_queues, sizeof(struct epair_queue), M_EPAIR, M_WAITOK); for (int i = 0; i < sca->num_queues; i++) { @@ -573,13 +568,6 @@ epair_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) scb = malloc(sizeof(struct epair_softc), M_EPAIR, M_WAITOK | M_ZERO); scb->ifp = if_alloc(IFT_ETHER); scb->num_queues = epair_tasks.tasks; - if (scb->ifp == NULL) { - free(scb, M_EPAIR); - if_free(sca->ifp); - free(sca, M_EPAIR); - ifc_free_unit(ifc, unit); - return (ENOSPC); - } scb->queues = mallocarray(scb->num_queues, sizeof(struct epair_queue), M_EPAIR, M_WAITOK); for (int i = 0; i < scb->num_queues; i++) {