From patchwork Wed May 26 15:34:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: miter X-Patchwork-Id: 1484103 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.133; helo=smtp2.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=R5EgmrB7; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 4Fqw4K3lRyz9sCD for ; Thu, 27 May 2021 01:34:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id EA397404E4; Wed, 26 May 2021 15:34:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 4GZJpWoIVsOm; Wed, 26 May 2021 15:34:54 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTP id 1BA6E40219; Wed, 26 May 2021 15:34:53 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id E7C9DC000D; Wed, 26 May 2021 15:34:52 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id D8B85C0001 for ; Wed, 26 May 2021 15:34:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D166783D6A for ; Wed, 26 May 2021 15:34:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=outlook.com 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 pFGyCucHJ5bg for ; Wed, 26 May 2021 15:34:50 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from APC01-PU1-obe.outbound.protection.outlook.com (mail-oln040092254094.outbound.protection.outlook.com [40.92.254.94]) by smtp1.osuosl.org (Postfix) with ESMTPS id 929EB83A69 for ; Wed, 26 May 2021 15:34:50 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MPZPIM63iyGhAiHOoCMIpeJhFzn8bmNJCnmAcCsPXjIupfWbcatHejaktwp0SiQ2grhST2/En66bHiJLQwGolpPZIjVy1jZnAssPgYLlQJ0K+8ZBJsf5ThcMt4uQT4j/uRrf3Gtn0OI4nkxoNdwlNKLPOv4yC/hEQgzFLRPSxjVvAfhfzG/F+vhb6RrV2bPM7VqpZv+vSYkHqogx43yWN5VJ2w5Sxrxkx9isVtvyxfaIdoSRHRJ89FkUzsCzckWsnVYfHrOltKFDEQzVm8i31422Ov5hh6lI63Qk0A18Xv2JthhgtKIwldBa4EVl77lAIUxoEr6yLmWPkGb1nd27tg== 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=JaIoQo/KmSGbjKbiE2r5DfzSgpmljW7QLoFt7TFzbsA=; b=QeOqK0T7JYwnirjK8EvNhCdszeKpXUU5Y0pEIiuXhaDlq2UXu0rw6SEB/PfIt3H1j/khcXRo6N3/HWjyKQWbVqKRn5OCaYzouEIAKmqw7vYdvWB1Omg8ssOa8cktnfkL6qWhHe38RPo+FZ3Kj+4b82nxn3+ejS3WMh/PEjf1x7Sr00fc6sSBw8SeZ9EbLgfPRNwSYokDrBFiF8JD8/eK74C9+YX3/CjsrkXUVnvZTHWH3gRWCiUKVwgBGFmcH3LDLfB2EJ5KlARbXq6XI9/ubPsrplj2gWcQak48idRrbEUo99TQ1zUysLsXZSN+fsl6OIUTKKipK83jB6jAUuAbkQ== 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=JaIoQo/KmSGbjKbiE2r5DfzSgpmljW7QLoFt7TFzbsA=; b=R5EgmrB7eqBpzxAkfHY3EVQR6yYvGJnaveOdF1z4wRjK75voFz730ASaAFEnMpA23PkKQmPNes272D1F+8sdGQ79QJDWZJqNL9Y+ukzuUeaGOBgrua1Ma/o9UnT1jEPKJbWGApA79Fy/ywkcGdheXHzFA4XcjzWNg3P28AbOzdDDRdogPyr3/QmTJVLKfQfZcf7Bxs2IqFiLG9JuPCQd1RmayFKUYikZMfA9sadFVDkohcONZiRRG/6sR7lITKvfh8iR2Cd6/nbOFSzj2BkYE5mKpIregD0v0mQwxVfQbZEc6BzvjRAZuY9ZOcI1kDqtvUHGvtZmTaOzovxfUn695g== Received: from PS1PR0601CA0103.apcprd06.prod.outlook.com (2603:1096:803:1::29) by TY2PR0101MB2767.apcprd01.prod.exchangelabs.com (2603:1096:404:af::22) 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:34:45 +0000 Received: from PU1APC01FT004.eop-APC01.prod.protection.outlook.com (2603:1096:803:1:cafe::d8) by PS1PR0601CA0103.outlook.office365.com (2603:1096:803:1::29) 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:34:45 +0000 Received: from ME3PR01MB5781.ausprd01.prod.outlook.com (2a01:111:e400:7ebe::4b) by PU1APC01FT004.mail.protection.outlook.com (2a01:111:e400:7ebe::98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.28 via Frontend Transport; Wed, 26 May 2021 15:34:45 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:EC09E6BF7E9E833974BE64FB786E13CB2418DDEEDFF6EC209B0591F3B839F136; UpperCasedChecksum:54E9943046698CC53BF20E407D380916107067B4BAC5DF714931EB66A1C518DD; SizeAsReceived:8657; Count:46 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:34:45 +0000 To: ovs-dev@openvswitch.org References: From: miter Message-ID: Date: Wed, 26 May 2021 23:34:40 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 In-Reply-To: X-TMN: [qU3n9XTfZaFleZQh2xh9GZGHRZJRac8i] X-ClientProxiedBy: HKAPR04CA0012.apcprd04.prod.outlook.com (2603:1096:203:d0::22) To ME3PR01MB5781.ausprd01.prod.outlook.com (2603:10c6:220:cf::7) X-Microsoft-Original-Message-ID: <577cacc9-1d71-d2f9-23a0-962787cca6d2@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [172.30.72.82] (218.85.80.138) by HKAPR04CA0012.apcprd04.prod.outlook.com (2603:1096:203:d0::22) 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:34:44 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 8ea564d9-0c23-4167-72e6-08d9205bc9c7 X-MS-TrafficTypeDiagnostic: TY2PR0101MB2767: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b6B8anGaLfx64z8pdivSxSqT8j6j44N9ZiNyVP1iYnRIXrubb3iUtMd8e2zQ63XIt/zpL95cRg3M5Npsfdy5mLRKlJkpwBi+NlI0hpDupmw4j7jkQoDl3hNmp7cE5qFCV1TD6B23IfLSPntc9LKobRYZwRAEpGdZpeukuNKmMCr/zl2V4X11DKttNel/6nuNU0iRliwZh05HX16Z8I5zBf4AybJYYCxDARXmFhcJg9i52q1GuPl35Nthzj+aWUe2NbDH3ZMfsIFIfB+AZDJynoWRDAXL6kn3BHv9cVQQuxBOjaKT8hJD6AkN5QxZ2vMU6y5aoZjYjyOwBUM8O2zEAgrlY27qG+vIfaDaIB4WKLPwfzgjESBl0u5DEeoJy4kP X-MS-Exchange-AntiSpam-MessageData: JNkFVUY85yuC1Gg8zPc3CDfk3oVP2mYYoSICLTUC3/Sg3W77EwtuZCyJBUwkxuMpAXCaTLA8ypy6Hl/mWw54g3O5HuhGX6Hnw4bC6gK1gJrYy7doWR0UTLQI43fDTpuqU6cJDBxSUSSlgHcckNPmyg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ea564d9-0c23-4167-72e6-08d9205bc9c7 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2021 15:34:45.0902 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: PU1APC01FT004.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: TY2PR0101MB2767 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" From 2061ef85f1e76e75e8752db6f6ee8c35dffbb728 Mon Sep 17 00:00:00 2001 From: miter Date: Wed, 26 May 2021 19:46:59 +0800 Subject: [PATCH] Fix bridge_configure_rstp if-else coding style. Signed-off-by: linhuang ---  vswitchd/bridge.c | 6 ++----  1 file changed, 2 insertions(+), 4 deletions(-) -- 2.25.1 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);          }