From patchwork Tue Dec 1 09:29:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 11942419 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB2DEC64E7A for ; Tue, 1 Dec 2020 09:32:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F02C2080A for ; Tue, 1 Dec 2020 09:32:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729092AbgLAJcN (ORCPT ); Tue, 1 Dec 2020 04:32:13 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:8226 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727744AbgLAJcM (ORCPT ); Tue, 1 Dec 2020 04:32:12 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4ClcKK1VJczkjNd; Tue, 1 Dec 2020 17:30:45 +0800 (CST) Received: from huawei.com (10.175.103.91) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Tue, 1 Dec 2020 17:31:10 +0800 From: Yang Yingliang To: CC: , , , , , Subject: [PATCH net v2 1/2] wireguard: device: don't call free_netdev() in priv_destructor() Date: Tue, 1 Dec 2020 17:29:02 +0800 Message-ID: <20201201092903.3269202-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.103.91] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org After commit cf124db566e6 ("net: Fix inconsistent teardown and..."), priv_destruct() doesn't call free_netdev() in driver, we use dev->needs_free_netdev to indicate whether free_netdev() should be called on release path. This patch remove free_netdev() from priv_destructor() and set dev->needs_free_netdev to true. Signed-off-by: Yang Yingliang --- drivers/net/wireguard/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c index c9f65e96ccb0..578ac6097d7e 100644 --- a/drivers/net/wireguard/device.c +++ b/drivers/net/wireguard/device.c @@ -247,7 +247,6 @@ static void wg_destruct(struct net_device *dev) mutex_unlock(&wg->device_update_lock); pr_debug("%s: Interface destroyed\n", dev->name); - free_netdev(dev); } static const struct device_type device_type = { .name = KBUILD_MODNAME }; @@ -360,6 +359,7 @@ static int wg_newlink(struct net *src_net, struct net_device *dev, * register_netdevice doesn't call it for us if it fails. */ dev->priv_destructor = wg_destruct; + dev->needs_free_netdev = true; pr_debug("%s: Interface created\n", dev->name); return ret;