From patchwork Wed May 26 15:13:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: miter X-Patchwork-Id: 1484088 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=Dc37lXtP; 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 4Fqvbv552bz9sRN for ; Thu, 27 May 2021 01:13:47 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 80B7983CE4; Wed, 26 May 2021 15:13:45 +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 N_CulAoSs6vv; Wed, 26 May 2021 15:13:44 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTP id C8E1983A81; Wed, 26 May 2021 15:13:43 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A569EC000D; Wed, 26 May 2021 15:13:43 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id A22DFC0001 for ; Wed, 26 May 2021 15:13:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 90C0A4014E for ; Wed, 26 May 2021 15:13:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=outlook.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ilhm-dX-Qe4F for ; Wed, 26 May 2021 15:13:41 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-oln040092253016.outbound.protection.outlook.com [40.92.253.16]) by smtp2.osuosl.org (Postfix) with ESMTPS id B903B400BF for ; Wed, 26 May 2021 15:13:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VTbZ40Gif6hd30BiZSNZwl7jdYU9b/wFk61DUATSY5wmQjKTY2KKOj4zfiD+xuliQii2ebsDXSPXpR4VW0yn2NKhIZxK/1AB13DzPKJSXhrZD/Y88f4iZm1m5nL/LEsjwpOk500FDu21EwXbBKrbkgD59qUh1Ip8FErkJY/Y+xti2OOczhHNHDdAJzUkDR8SdS0owq9g/+IAhqIpbhgAH84aLzfXmSujYfXteph5Hqn1DjpOy6FaSqTr4zrs6VCYWN+SsywcvcLT2omJQzAxjZnI+HRk1TlrnYk8mNdE8BrKFr1ANHrRsoz3npGBkHESnBVAaFI3DwFCiLbi5L6fJQ== 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=KwxlHz+471WPRWWC+glZJD/vXed+l5OM2RADOQcxh66ty5YZcgS1ulcBaUWteuCxMUw1Dz+mWG7PG2fvzzYilGXnVAGIwBlYnloSC7YBdpNw/DfQP9MBYmkf722tRRn89g7JByM+D24Spm9wDlGBWHwbEpuyYCB9v6sdORRR26PvOo6BLKgyPsG4fjvZhnaEKVMufg4vYy08+nBN1CJ5DLbBAPkmE2kdkyTTgTnhBdTCw3ESK6bkxn+7mhkxtA4taea3NZeRu5xTExyGna1y2M5NqzOUNLXha6tJ8bueqDdTUGurLpYVvDaGqPADTtzIWHxFwJfO8ByW8X5V/sXMuQ== 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=Dc37lXtPjZ24564peWVKnR5sA41M611qBVGg8YdZuVneYxvPHLGbeY1AliRuNnavRipKhS6Dv2pA5RTfQFaJHnt3LdCnyfMtMmMHfTdtxqh+nvrZ69M3JZQ5mTZSgPf3exsdgiB0iSoCC99zGyKTSW8PSzI2R0iJxK9q/AtKSEeUvAY0fmI4LuRVEr1jzzqbGZG5GTVTUA0tqe44bDutHUD3z43Rtd7536TfbJItBov+JNkuymo05GcDbIBTtZIlSANG8ynGQOnZTOVQdaPppGDGvLmXADVBBhFZQzJxpWNzL2P/32yT+wf2WbuK7LGBaYKhZx8eYPeIOHa49rRtoA== Received: from SG2PR02CA0013.apcprd02.prod.outlook.com (2603:1096:3:17::25) by HK0PR01MB2612.apcprd01.prod.exchangelabs.com (2603:1096:203:a0::19) 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 15:13:36 +0000 Received: from SG2APC01FT052.eop-APC01.prod.protection.outlook.com (2603:1096:3:17:cafe::18) by SG2PR02CA0013.outlook.office365.com (2603:1096:3:17::25) 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:13:36 +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:13:36 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:6B0812B87E4B997CEE536F070B2B2E056F733DA0E52FA6EFE2BA18803B807047; UpperCasedChecksum:4EFDFDBF6E16C78C05D5A410E9E8674DD244FE433E9AD2673488B0AB72BF1E42; SizeAsReceived:8448; 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:13:36 +0000 To: ovs-dev@openvswitch.org From: miter Message-ID: Date: Wed, 26 May 2021 23:13:30 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 X-TMN: [cvP9AuWfV/Q03De+ivJLalwVmUY1fGRz] X-ClientProxiedBy: HK0PR03CA0111.apcprd03.prod.outlook.com (2603:1096:203:b0::27) 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] (218.85.80.138) by HK0PR03CA0111.apcprd03.prod.outlook.com (2603:1096:203:b0::27) 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:13:35 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 44 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 7f9de1a3-22fd-4624-b692-08d92058d54f X-MS-TrafficTypeDiagnostic: HK0PR01MB2612: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K/zDoa5ztCFh/SYsajwoW5d74/5xsvwV8MvSPov/rZkvO5TxOrbum72AdcoBVM7PekyqJak1CTK1O3uOIewAv/+A5copCWVKBzltI7sXzVhKTpOlLrVczjJ+EVMDZhs5FjL55lF4UEoSnbALu80NndahYiVmZP661WG/tELp3Nn0KrrqxBIKi6Ctw9a7+4XqpbIO2bJxlk1EcdHgCvVufBslkLaZdTlo4GgX7WTDXYwNgvWXuQquW6u6nUZpkB24vg+4BWcHP6g7VBHo7TaFGigKq9UzStfsicfyd0ZC7DDhCxoNrnejhsUfU56tbBPCT0q2g2hQJMTld5HPyC+JjmODQNHb+q6HvpSgvDlOlq/qg/W4V0VwRgqK/d+cislLCOSvfEQ57RilLa8vkPp+2Q== X-MS-Exchange-AntiSpam-MessageData: 9IOP5V587zZt3mJzwEnNQ7Frvz/eomuY7AEmhAdkl6pVxeYmIENfORy14IbuIvM4E1O6lV51WqDrQ2Y2yFoQqNuGROcZVct82Yd4yitkjirUkw05M28qAATUkd6wljhzFTvO3p+XL2Gz6cvSVemXxg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f9de1a3-22fd-4624-b692-08d92058d54f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2021 15:13:36.0584 (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: HK0PR01MB2612 Subject: [ovs-dev] 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);