From patchwork Wed May 26 11:50:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: miter X-Patchwork-Id: 1484008 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=outlook.com header.i=@outlook.com header.a=rsa-sha256 header.s=selector1 header.b=Y6thq82l; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fqq5V0d7rz9sTD for ; Wed, 26 May 2021 21:50:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 82BEF83C67; Wed, 26 May 2021 11:50:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id day3MEmo8e4V; Wed, 26 May 2021 11:50:35 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTP id B0ED283925; Wed, 26 May 2021 11:50:34 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 721DEC000D; Wed, 26 May 2021 11:50:34 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id BA99CC0001 for ; Wed, 26 May 2021 11:50:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 94CEB83B9B for ; Wed, 26 May 2021 11:50:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id W2nURyH9qda7 for ; Wed, 26 May 2021 11:50:31 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-oln040092253014.outbound.protection.outlook.com [40.92.253.14]) by smtp1.osuosl.org (Postfix) with ESMTPS id 0E33183925 for ; Wed, 26 May 2021 11:50:30 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MqGHjNFFgtAdlnyib5CGjtQUgnh5mLMJRd+25DC77c4vkbP2zvDEIdMV7wPH+9mt25U44jfsI11+2cJIu1wgCbUNX0haCkMHPsGzGveVHJRGfDFHn2BZGNI49ntTz0CdBqO+xjxjiLpZdqAMnplGLR7XW8wK3N8ga4+TFaeOHqxqpasz6OG1wDySBgFhDxibrnry3Hn4lnKI9uBCq/yh4PdaWHnZJu5u9qhMSIqpfbyIdRa7BQxB1VvEsoB7Q8h2Q7ABjjjErOVTM9TKGkDW34JKvW5U2xeL/0k3QrR1iNXTi446c8jNubdYdonbrvf3TLXdEVwNiNc4O+j9lEbfGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=icFHGkOb/MdTt2JKkAiBym9n3JFi6cCDGm02qAmtrwY=; b=i6tIkX29PixasGDgbWIHZJeF7BdyAI5qddxXt9SGZ47uZfzQW7/lY8z2IZVW6R+wXnVcdyDPShD04j3w12nhm/zXbgflK5FsNibiObaLdlFREW4GZrPd4Bk6v1nEx12dpA0I7tPUuHh2rgPp+K3IEp/m9r1rf48wd8HW3EPIly4JZg5etF513Wd/2o/rTmiD6Y/H8x02aCY/s+RsvRJWzjCLyXz8pP/6iOG/eZ/skgEbdQX+olpoUVw1EbOmqwabUu2M6xZXdhbZZaDrKPiuXiTbz8bMH/Bo8Cgf/HuUz6emGatxFuGFU1Xu5f24vKwvE6cY8cBj/qANuyRKUFVHog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=icFHGkOb/MdTt2JKkAiBym9n3JFi6cCDGm02qAmtrwY=; b=Y6thq82lj2aAKLrKjBVkCy1wOQPDRp4VxxNhdHnzUCwsLqwLJKXSzNF9EGXV3h7iLdmJgpOWmUACH2tBIaGUWRcuSEYvOIea8/xkHcYCMczv8kovBZKz4Topa0PTWrMW04FofKdWtZZ8ywViSZPktJnl0/yjgVjIv/oHPecGq9z12tHSO5UjoyNgTMjO3vvK+ZrE544ef6EpUW57Q7hr1M8ufDSDVyUE/PTrYMM8299ktnvprOhHnA2d4J3RP5GBD0JD7GM8pXKPyxVEzbHrdd/9c46VqYcNQbya/lFbvsQ8LHhOeDQpL20C/P4wy8EAKEDknBee/4oMh4qH26Xuzg== Received: from SG2PR04CA0177.apcprd04.prod.outlook.com (2603:1096:4:14::15) by KL1PR01MB3429.apcprd01.prod.exchangelabs.com (2603:1096:820:1b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.26; Wed, 26 May 2021 11:50:28 +0000 Received: from HK2APC01FT036.eop-APC01.prod.protection.outlook.com (2603:1096:4:14:cafe::f8) by SG2PR04CA0177.outlook.office365.com (2603:1096:4:14::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Wed, 26 May 2021 11:50:28 +0000 Received: from ME3PR01MB5781.ausprd01.prod.outlook.com (2a01:111:e400:7ebc::48) by HK2APC01FT036.mail.protection.outlook.com (2a01:111:e400:7ebc::341) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 26 May 2021 11:50:28 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:F530E8D572C2A35E214CA2C50E9F973B60BC998BF1B10140E2CA19AFC4417D79; UpperCasedChecksum:8586D8872CB70E7E51DAB5C31E94DA691C54B1DD82E39327461B43422B38D5C9; SizeAsReceived:8446; Count:44 Received: from ME3PR01MB5781.ausprd01.prod.outlook.com ([fe80::70f7:fd46:87cc:96a]) by ME3PR01MB5781.ausprd01.prod.outlook.com ([fe80::70f7:fd46:87cc:96a%7]) with mapi id 15.20.4150.027; Wed, 26 May 2021 11:50:27 +0000 To: ovs-dev@openvswitch.org From: miter Message-ID: Date: Wed, 26 May 2021 19:50:22 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 X-TMN: [ioUIgnHajDbRrIR54VF/koJdO1C/mAdG] X-ClientProxiedBy: HKAPR03CA0030.apcprd03.prod.outlook.com (2603:1096:203:c9::17) To ME3PR01MB5781.ausprd01.prod.outlook.com (2603:10c6:220:cf::7) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [172.30.72.82] (58.22.30.3) by HKAPR03CA0030.apcprd03.prod.outlook.com (2603:1096:203:c9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.12 via Frontend Transport; Wed, 26 May 2021 11:50:26 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 44 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: b796c895-cb61-4500-8203-08d9203c742d X-MS-TrafficTypeDiagnostic: KL1PR01MB3429: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JFWieOVfCTNwe9ebZihKeqK4JucC3budltFxHD9udqc1NI+9kqK3J78MlLzyw4jTEKPxTDHwH82tvSAndU/uF7aPiFDDbtcZZzEM7hbQR1qP/I39Foql1Xd4uWyQQva2kgx91BTwBs/50uDNEfNK60Lkh+sYRLc00OhfckmJelAGuXZCI7o0o80eiPK4VuXZpu2rUCWaV4XBp26RbHAnoZCeBqo/eTE4xEl5ncf0Rj6sB6M788DpAcI7vI9mG0FimJf5TRCVu3WcC49IIR/X+gyZrvr3TTxfeJFSUF6DTXoIrq3AM0c4K2DNWT2Mz/3iZf4vVC4HkQFb0D4PI2gHmpXxTG8v/bI8Swf6nyElM53O6b5DBoLMOqd4yD20q5KWuZEvbdqJKMClZ7i6mfbqmg== X-MS-Exchange-AntiSpam-MessageData: /pv0sm2lIoALMw+7enFLa+1OYNJbjVm0EtQmkvFnu+5iZ0Ftj7NrykIMWo4X/Xb4WNmlHakNJ3coDmhiCGMgLBeY9NJxm/Gmxc10C7hbG1B9Y0b+uU5BSW3AQlngIbC45D12+heYnoH0CsdCjlPNNQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b796c895-cb61-4500-8203-08d9203c742d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2021 11:50:27.2147 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HK2APC01FT036.eop-APC01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR01MB3429 Subject: [ovs-dev] [PATCH] bridge.c : Fix bridge_configure_rstp if-else coding style. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Author: miter Date:   Wed May 26 19:46:59 2021 +0800     bridge.c : Fix bridge_configure_rstp if-else coding style.     Signed-off-by: Miter Lin          } diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 5ed7e8234..4ada54475 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -1883,14 +1883,12 @@ bridge_configure_rstp(struct bridge *br, bool enable_rstp)              if (eth_addr_from_string(config_str, &ea)) {                  br_s.address = eth_addr_to_uint64(ea); -            } -            else { +            } else {                  br_s.address = eth_addr_to_uint64(br->ea);                  VLOG_ERR("bridge %s: invalid rstp-address, defaulting "                          "to "ETH_ADDR_FMT, br->name, ETH_ADDR_ARGS(br->ea));              } -        } -        else { +        } else {              br_s.address = eth_addr_to_uint64(br->ea);