From patchwork Tue Aug 8 18:23:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 799388 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) 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 3xRjWC3nN6z9sR9 for ; Wed, 9 Aug 2017 04:25:27 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 8D38FB69; Tue, 8 Aug 2017 18:25:24 +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 3ACC4B68 for ; Tue, 8 Aug 2017 18:25:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9FC8E1F2 for ; Tue, 8 Aug 2017 18:23:55 +0000 (UTC) X-Originating-IP: 208.91.1.34 Received: from carno.eng.vmware.com (unknown [208.91.1.34]) (Authenticated sender: joe@ovn.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 083F0FB8A9 for ; Tue, 8 Aug 2017 20:23:53 +0200 (CEST) From: Joe Stringer To: dev@openvswitch.org Date: Tue, 8 Aug 2017 11:23:31 -0700 Message-Id: <20170808182332.24497-1-joe@ovn.org> X-Mailer: git-send-email 2.13.3 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCHv2 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 Reviewed-by: Greg Rose --- lib/netdev.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/netdev.c b/lib/netdev.c index 7e9896b82928..3e8b211857d7 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -2255,6 +2255,15 @@ netdev_ports_get(odp_port_t port_no, const struct dpif_class *dpif_class) 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 struct dpif_class *dpif_class) { @@ -2266,10 +2275,7 @@ netdev_ports_remove(odp_port_t port_no, const struct dpif_class *dpif_class) data = netdev_ports_lookup(port_no, dpif_class); 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; }