From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E0CD03D9545; Mon, 17 Aug 2026 15:23:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786980224; cv=none; b=ghecmEiRg/zcFKl1+0+Estvyz9P0M04Fgjy8wobKhVaqCxdlif3W0EYUKAbY3kH1ZzmzMiCy8SgdESls+nEGv6Ekygb99S+3UQVeEoSqvFM0w+EPAzZa4vYqWUasfVIGsNc5vwHggicX/Pa7AzhUKzjJ1ONzWaY4IAzD+B+CiII= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786980224; c=relaxed/simple; bh=WMa3kgej+vnxJQrH/BeswNXnv8Afg9Fb5VKiRDH/MUo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CiCSr5K9PWG3Xywz/kTfA3HY9hFzRdumd7mVwMBuASDAk1Vs+6JYzNt8Jl1NbjQABGp+/V1yQnmu0WiotHcVhLRRUPuFqp8Nf3zImtSPLxHveqKBPloRljLy17ValHgON+BJ48Fg8EVCRcNOfz3f0I7PZJxBF8NcrqJ8ypNLnng= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=B3n4x0q1; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="B3n4x0q1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 369B91F000E9; Mon, 17 Aug 2026 15:23:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786980222; bh=+HvKQ/SjzuwylEHhWHzWpvgMh+mD8N4TVhMfNNZQ2v0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=B3n4x0q1rM0lG/9kM4B3PABuTIz42lVMrOru9BSGU11ABhA0NEjX63DAE7vrDo7yZ 2utBvsTi9fMd1ajouSzCvaitaDO3c+2mvVhxBqDMXZCKG35LXjoJnZTQXd1EtDZ+qa 4ZpyuqTu4Glq9TYgxX0yb/Km1KlCzTYTFRBFAk+k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jiawen Liu <1298662399@qq.com>, Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 499/609] net: hisilicon: hix5hd2_gmac: remove redundant NAPI delete Date: Mon, 17 Aug 2026 15:33:15 +0200 Message-ID: <20260817132600.584924880@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260817132543.039278408@linuxfoundation.org> References: <20260817132543.039278408@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiawen Liu <1298662399@qq.com> [ Upstream commit f307a7dc32097c11413178fca437a10d20890bc2 ] hix5hd2_dev_remove() calls netif_napi_del() before unregister_netdev(). This is not needed because free_netdev() deletes all NAPI instances attached to the net_device. Remove the redundant call and let the networking core tear down the NAPI instance during unregister_netdev(). The probe error path still keeps its explicit netif_napi_del(), because the device has not been registered there. Fixes: 57c5bc9ad7d7 ("net: hisilicon: add hix5hd2 mac driver") Signed-off-by: Jiawen Liu <1298662399@qq.com> Link: https://patch.msgid.link/tencent_5FFD37A252B4FEA6A80AD25B17C8E904F005@qq.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c index f867e95311173..4834cf1cd9b3e 100644 --- a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +++ b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c @@ -1288,7 +1288,6 @@ static int hix5hd2_dev_remove(struct platform_device *pdev) struct net_device *ndev = platform_get_drvdata(pdev); struct hix5hd2_priv *priv = netdev_priv(ndev); - netif_napi_del(&priv->napi); unregister_netdev(ndev); mdiobus_unregister(priv->bus); mdiobus_free(priv->bus); -- 2.53.0