From patchwork Fri May 19 20:27:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 764842 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 3wV04L1Rs9z9s2s for ; Sat, 20 May 2017 06:28:18 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 44B5DBAF; Fri, 19 May 2017 20:27:50 +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 6FF86B50 for ; Fri, 19 May 2017 20:27:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id BA8F81B3 for ; Fri, 19 May 2017 20:27:46 +0000 (UTC) Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by relay7-d.mail.gandi.net (Postfix) with ESMTPS id 93A532C1; Fri, 19 May 2017 22:27:45 +0200 (CEST) Received: from mfilter19-d.gandi.net (mfilter19-d.gandi.net [217.70.178.147]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id 81F0DA80C2; Fri, 19 May 2017 22:27:45 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter19-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter19-d.gandi.net (mfilter19-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id 29PPfBg0SppH; Fri, 19 May 2017 22:27:44 +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 relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 3FC3BA80D0; Fri, 19 May 2017 22:27:42 +0200 (CEST) From: Joe Stringer To: dev@openvswitch.org Date: Fri, 19 May 2017 13:27:34 -0700 Message-Id: <20170519202736.5685-2-joe@ovn.org> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170519202736.5685-1-joe@ovn.org> References: <20170519202736.5685-1-joe@ovn.org> 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 Cc: e@erig.me Subject: [ovs-dev] [PATCH 1/3] dpif-netlink-rtnl: Tidy up some code. 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 Simplify and refactor a couple of bits of code for improved readability. Signed-off-by: Joe Stringer Acked-by: Eric Garver --- lib/dpif-netlink-rtnl.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/dpif-netlink-rtnl.c b/lib/dpif-netlink-rtnl.c index 7faad5248037..0ca6529e9d82 100644 --- a/lib/dpif-netlink-rtnl.c +++ b/lib/dpif-netlink-rtnl.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2017 Red Hat, Inc. + * Copyright (c) 2017 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -369,17 +370,16 @@ dpif_netlink_rtnl_port_create(struct netdev *netdev) err = dpif_netlink_rtnl_verify(tnl_cfg, type, name); if (!err) { return 0; - } else { - err = dpif_netlink_rtnl_destroy(name); - if (err) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - - VLOG_WARN_RL(&rl, "RTNL device %s exists and cannot be " - "deleted: %s", name, ovs_strerror(err)); - return err; - } - err = dpif_netlink_rtnl_create(tnl_cfg, name, type, kind, flags); } + err = dpif_netlink_rtnl_destroy(name); + if (err) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); + + VLOG_WARN_RL(&rl, "RTNL device %s exists and cannot be " + "deleted: %s", name, ovs_strerror(err)); + return err; + } + err = dpif_netlink_rtnl_create(tnl_cfg, name, type, kind, flags); } if (err) { return err;