From patchwork Tue Jun 27 18:13:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 781327 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wxvFR1QDKz9s2s for ; Wed, 28 Jun 2017 04:14:03 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E5629CC1; Tue, 27 Jun 2017 18:13:31 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 55751CBF for ; Tue, 27 Jun 2017 18:13:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D130F1A0 for ; Tue, 27 Jun 2017 18:13:30 +0000 (UTC) Received: from mfilter34-d.gandi.net (mfilter34-d.gandi.net [217.70.178.165]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id 936A717209B for ; Tue, 27 Jun 2017 20:13:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter34-d.gandi.net Received: from relay4-d.mail.gandi.net ([IPv6:::ffff:217.70.183.196]) by mfilter34-d.gandi.net (mfilter34-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id GQ9fcEZy5skH for ; Tue, 27 Jun 2017 20:13:28 +0200 (CEST) X-Originating-IP: 208.91.1.34 Received: from carno.eng.vmware.com (unknown [208.91.1.34]) (Authenticated sender: joe@ovn.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id D0987172098 for ; Tue, 27 Jun 2017 20:13:27 +0200 (CEST) From: Joe Stringer To: dev@openvswitch.org Date: Tue, 27 Jun 2017 11:13:09 -0700 Message-Id: <20170627181310.2911-1-joe@ovn.org> X-Mailer: git-send-email 2.11.1 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 1/2] netdev: Refactor destruction of netdev_ports. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org An upcoming patch will reuse this from elsewhere. Signed-off-by: Joe Stringer --- lib/netdev.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/netdev.c b/lib/netdev.c index 765bf4b9ccad..eb7aef7376f1 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -2218,6 +2218,15 @@ netdev_ports_get(odp_port_t port_no, const void *obj) return ret; } +static void +netdev_port_data_destroy(struct port_to_netdev_data *data) +{ + dpif_port_destroy(&data->dpif_port); + netdev_close(data->netdev); /* unref and possibly close */ + hmap_remove(&port_to_netdev, &data->node); + free(data); +} + int netdev_ports_remove(odp_port_t port_no, const void *obj) { @@ -2229,10 +2238,7 @@ netdev_ports_remove(odp_port_t port_no, const void *obj) data = netdev_ports_lookup(port_no, obj); if (data) { - dpif_port_destroy(&data->dpif_port); - netdev_close(data->netdev); /* unref and possibly close */ - hmap_remove(&port_to_netdev, &data->node); - free(data); + netdev_port_data_destroy(data); ret = 0; }