From patchwork Mon Oct 12 18:27:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 529303 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id 96713140DA8 for ; Tue, 13 Oct 2015 05:27:41 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id A1101105E9; Mon, 12 Oct 2015 11:27:40 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v1.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 85348105E6 for ; Mon, 12 Oct 2015 11:27:39 -0700 (PDT) Received: from bar4.cudamail.com (bar2 [192.168.15.2]) by mx3v1.cudamail.com (Postfix) with ESMTP id A25BD618507 for ; Mon, 12 Oct 2015 12:27:38 -0600 (MDT) X-ASG-Debug-ID: 1444674458-03dc213abbe8d40001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar4.cudamail.com with ESMTP id kuQ1ZFFnkGHmw9SN (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 12 Oct 2015 12:27:38 -0600 (MDT) X-Barracuda-Envelope-From: blp@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO mail-pa0-f43.google.com) (209.85.220.43) by mx3-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 12 Oct 2015 18:27:37 -0000 Received-SPF: unknown (mx3-pf2.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.43 Received: by padhy16 with SMTP id hy16so160167947pad.1 for ; Mon, 12 Oct 2015 11:27:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Fobbi5UwOb6r2pnSAUks333CPGxJRTDqF6hUF3QNsto=; b=Joe14hbEr57CkcCz+vi1CkkRaMXNNIiZSOIoWHm9QEFxOmCb2rmvSX2R5jUJO2TAEJ NhSSnSuR0j0H1JVVWh12oxD278I/QdUwdSPC4u0xtLCIr289Q96p5J7pIArlwDlgXAJJ 0tZphYCemSc6enGTUIy6YWXX/GSa0UjlR+H0nsI7al0oQXbJZVi/QKyvC329C8sRkOmn 6Y9sgg83x8dyrcRCH5lEqVQXgyI0wEW1bY8M7HL/aEqdyNhUie0qFau1MgKwZ06jI8xs h5Blx87avc3gWC7dqvOQ0KH/CPxBgLmM/Ji0Mh/d7zrS3NTDN4IdJS958b3rcrRK/UaV ujhg== X-Gm-Message-State: ALoCoQn9h+MQuJCcBHezY3a7GMYGiw9z8bHA0xNsobcjGLpNbkIorKwim4dgh92N2HCWrHU7e7Gk X-Received: by 10.66.254.73 with SMTP id ag9mr5798747pad.116.1444674457521; Mon, 12 Oct 2015 11:27:37 -0700 (PDT) Received: from sigabrt.benpfaff.org ([208.91.2.4]) by smtp.gmail.com with ESMTPSA id sv9sm19610154pbc.44.2015.10.12.11.27.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Oct 2015 11:27:36 -0700 (PDT) X-CudaMail-Envelope-Sender: blp@nicira.com X-Barracuda-Apparent-Source-IP: 208.91.2.4 From: Ben Pfaff To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V2-1011042447 X-CudaMail-DTE: 101215 X-CudaMail-Originating-IP: 209.85.220.43 Date: Mon, 12 Oct 2015 11:27:35 -0700 X-ASG-Orig-Subj: [##CM-V2-1011042447##][PATCH] bridge: Coding style fix. Message-Id: <1444674455-15012-1-git-send-email-blp@nicira.com> X-Mailer: git-send-email 2.1.3 X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1444674458 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH] bridge: Coding style fix. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Ben Pfaff Acked-by: Andy Zhou --- vswitchd/bridge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 232a334..b966d92 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -1046,8 +1046,9 @@ bridge_configure_datapath_id(struct bridge *br) static uint32_t bridge_get_allowed_versions(struct bridge *br) { - if (!br->cfg->n_protocols) + if (!br->cfg->n_protocols) { return 0; + } return ofputil_versions_from_strings(br->cfg->protocols, br->cfg->n_protocols);