From patchwork Wed May 26 15:15:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: miter X-Patchwork-Id: 1484089 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=2605:bc80:3010::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=O7cVDl45; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::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 4Fqvff2KVqz9sRN for ; Thu, 27 May 2021 01:16:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 340F083D6B; Wed, 26 May 2021 15:16:08 +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 nzo_-JOa-Ezj; Wed, 26 May 2021 15:16:07 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTP id 7353583B8F; Wed, 26 May 2021 15:16:06 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 46FF8C000D; Wed, 26 May 2021 15:16:06 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id EDAF5C0001 for ; Wed, 26 May 2021 15:16:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CF52B60731 for ; Wed, 26 May 2021 15:16:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=outlook.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gna90cIelC7T for ; Wed, 26 May 2021 15:16:04 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-oln040092253065.outbound.protection.outlook.com [40.92.253.65]) by smtp3.osuosl.org (Postfix) with ESMTPS id F2C7C6072D for ; Wed, 26 May 2021 15:16:03 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hQn/2M/dXgLE3i7cmfXgdwsxZzzXmwOeY5cqc4z2xIC/dpD7ftEYJY57N8dIo6I6VjEpkMOkfSXIz4YBQ/YVrYdrzfFGBuH+htNY9LXRAoStfG1g1vX2vebHaVxP7f2lAoFP8ztnrDftO0vobt0tVUnuOAJLgP7awN1g+0Dxt2SwmxZDYai3HuWtsiCtVze5eRslMFhhtlppt3vwACcONdcsBMTKDiJg9nJpExwDfiWzSMTo8nsMkbw0/uIZzvXFwsTjE6TOP/l3Rvw3tI29dsbWliK/XU7OOnCzbzkK7YhPLOwI0WQ9Hb4IARNnvV9m27Eq9JUbqP++wkvU/7+YTA== 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=E+TueL4XZurGgrA6/ZpTf2qPQfECNlGuKIJzuJK7nmw=; b=NakjH5o8igKs42Heb4Aw4tbqP8a06227RdLiQaIrqRuePazeSqyB83DT5NWFdyH7fxw+ZhT0pjXNLTRFkZs3wJBzaHPS1ckBJs932YKrXIYLTcmhUCzVVDYQOSo7uUVGhTexUB+Fwul/o38gH8VscuRYHlx5lQ88aGFAMXF72uU0rvrx1+cYP9ueyH2WLe9J2CAaEGfK97a8aAWirqStpalq7n9bTRfeLpzdNRMy0Dqp/1ocpi4AvG0/BYBwysaY0GEIyoNptLxNuPPZAoBER4vzkSrjAtrWnSjP0ZsKYT5LgglT5n2lbVRpAsE+HOIm5BuHKfyIv8aH5f+9SPdxsw== 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=E+TueL4XZurGgrA6/ZpTf2qPQfECNlGuKIJzuJK7nmw=; b=O7cVDl45b2gGhEIuLfhgBslKMqJps3Dryx3bcrmMUR/A3/zFpAOeyWd7KJb7s3RjNHhA47J8BTQN7ahTuE7v0K7oRWw8ChHArYZKuY2ae0ZrhiSdXbTEbcxNH6XyvIob0R3Yy+nDLQM5Gh4NbkcOhYxyo0rpSzvidTBBF3UW+lKL7Lrln4YrD3GkRrBu4+Isu3+/Jf1cDK0yvfOXTAvsyS7DD/jGXDAfs2ejR4sci5hKv5zbkJbsEqGu1Ew9ryU1xCQiwEZumALTx8of5mjO1bXpg6CJRnHDITiRqkdVfrBDVD+BMJtYLCSlcCPeIpSiuwvQuyF1WqEI6HdqGJjf3g== Received: from SG2PR01CA0105.apcprd01.prod.exchangelabs.com (2603:1096:3:15::31) by KL1PR01MB3827.apcprd01.prod.exchangelabs.com (2603:1096:820:48::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23; Wed, 26 May 2021 15:15:59 +0000 Received: from SG2APC01FT052.eop-APC01.prod.protection.outlook.com (2603:1096:3:15:cafe::b8) by SG2PR01CA0105.outlook.office365.com (2603:1096:3:15::31) 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 15:15:59 +0000 Received: from ME3PR01MB5781.ausprd01.prod.outlook.com (10.152.250.59) by SG2APC01FT052.mail.protection.outlook.com (10.152.251.14) 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 15:15:59 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:5C4EF6944C4D97D9143298D9E0CB821332A31297DCCD1BE9FB2E37F6E1C89979; UpperCasedChecksum:2E98B730AD9581AB1A5861EE1E1847A7409ADDC99DDE9DC2A8D7F8B3C8D6C0CA; SizeAsReceived:8447; 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.4173.022; Wed, 26 May 2021 15:15:59 +0000 To: ovs-dev@openvswitch.org From: miter Message-ID: Date: Wed, 26 May 2021 23:15:54 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 X-TMN: [aJnefmZdb8lNNWriQQeI8YS7bv8Bv+sx] X-ClientProxiedBy: HK2PR02CA0152.apcprd02.prod.outlook.com (2603:1096:201:1f::12) 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 HK2PR02CA0152.apcprd02.prod.outlook.com (2603:1096:201:1f::12) 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 15:15:58 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 44 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 14a80d1c-13c0-4e4f-ab60-08d920592af8 X-MS-TrafficTypeDiagnostic: KL1PR01MB3827: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MRsETLAufm85IWB6qJRW+IDOxkwdbG4jKC5AKR/+C6btI2h0ZJEZfSsJyh8X2IYKa60jvujr8J2DXkYON/nlguvyuTzEVQZ6sr1AEZqpqVP/EU0cXAwr+XS4ECy0EzEOMpjpG4D/7cSwaKgoJtkoOu6iIwuM69cRtvHbc71pomwjH/A2X8U/+23hdI0AVKm/i6B6hNTNvUorttXmyAfzFXcMmrtnqgtSFJPoPvHdzplZlTonNYzognBRt1M+Cdk5GNgmVzsieMF5mtFXcNdC1A/ERUL9aTsQemkWaMbIaHFBIfhahCUVuD5iUQj1sZm5sIbgt3Mta6ruPc4V+bUoFr6eQUQq0FEhMV91Akz7Wogc+PEvNSGJU498VfQIaXbC3HpW7eRjjbq0HOqvg7KfVA== X-MS-Exchange-AntiSpam-MessageData: RMNxJWRP2MUgfkm4UEqmhu4n55j6raeoxYi+VEnV0WfRQCvkUNUpQXWicO4PJNd7ZhICfZ0FLNsJ6FAvGEygzUvDSyIMpDi89Mx/WfWxW0CxmcU6v68mhhZpvhqi0Rjzdc+b2rwFFQqNqHxyxV5s/Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14a80d1c-13c0-4e4f-ab60-08d920592af8 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2021 15:15:59.6565 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: SG2APC01FT052.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: KL1PR01MB3827 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);