From patchwork Mon May 31 12:20:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: miter X-Patchwork-Id: 1485647 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=AdydSuxO; 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 4FtvXy0vhYz9sWF for ; Mon, 31 May 2021 22:21:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1FAFA83B96; Mon, 31 May 2021 12:21:34 +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 8QhaNCzvIsL7; Mon, 31 May 2021 12:21:33 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTP id 62E11839BC; Mon, 31 May 2021 12:21:32 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 34A26C000E; Mon, 31 May 2021 12:21:32 +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 24A7EC0001 for ; Mon, 31 May 2021 12:21:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 0656C83A1C for ; Mon, 31 May 2021 12:21:31 +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 vfaoOs2_0S5W for ; Mon, 31 May 2021 12:21:30 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from APC01-PU1-obe.outbound.protection.outlook.com (mail-oln040092254090.outbound.protection.outlook.com [40.92.254.90]) by smtp1.osuosl.org (Postfix) with ESMTPS id A26DE839BC for ; Mon, 31 May 2021 12:21:29 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HSvpxfbTiunB+Qun6GA892UX3cbTr/YzR/18jHLdCsSxUh9NwgdrZrWgdZL3VzI60qttwP++xQcLUpQPcoQBQBl8khZ6gCvYFbXeylW9BbSvem5D5vp/gN79fvgy5gJkXoZj7JjOQsx+OoV+8vVGJdtAad6FRaP0E6Tb7ge/Oa6+NC0PiEb4+xCI3kEgILNYpo9U/grXM/4IMJv8+M5GpFY9LWA15kVwP2wahmfykIdTvgG5NQ1rfcfx8PqGsPFG/8uwGqvow2OFsvXcQPPzY10Jo/325QEQr1HBF2r+5mItTjW/tXAhFsv+nv6Ebg1eM7s/9uj9mdRM0K6sJZZf2Q== 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=fY8T86Wrcs/Hp02E8liE+YmH1t29P7r9PbeCB+zA8GQ=; b=BVFh9gUNJ8iVyXoctlBmnNl/b596G5cSpeOwsb6axU677EznVwA/3E/ccdK4PtMItr40j6tTuZxfmU+tDsnPJPSgGWnLj0VqjjHFEGvoGgmwBCtEbJWTQnZSpEwaeODJ4Nt/oTcnS3nxEqSXIoWm4bjdvKmzu47NB9GxAro/3VOJBtHFyPeSYOzLgIp6tl1DE4ZydVLLNRB//VeTkPFtAET1oEST7rma7AXfMjWKMKAbnNZF7Au+tUE0HZlqo3Ud8mF9xJ2LTuvzcPEIr786Rt6Kou0DTf66FTCVB8lGFXchP6kciOEksCoynWTjG8wNh66f6C+sVlZ3J4mdDMWFOA== 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=fY8T86Wrcs/Hp02E8liE+YmH1t29P7r9PbeCB+zA8GQ=; b=AdydSuxOjRume1FSKdzvRCMWDdg6YgvI8fS6+Mb59qGLkYUPkKq8FtOK59uQaghfx7JpJGRIO4db5dF+QUm1z8dUFK5AC0qdzXvE5n4IKUWT/mXXUd+ZILJU6OoEng3OvFsQkIHN5LFhpvbSqyvH4y3WmXhPGJMfQQOxaiKxBtNlkrdiG6cW6zoPfGhz/FWKlg6/mOcAS1EqRCqJz7FX34igLjl6aG90C79zq1ab4JU0CQnKcO0TU9prqUukHucBSO9yL6tmMgzbkrr2JeVcLXm6XA+DuMTUI5KE6xNO9CcR7Fv+pTq5Wycd2Nwl1GzPs6mN3cZQMtPS/zVS8aMq2A== Received: from PS2PR03CA0005.apcprd03.prod.outlook.com (2603:1096:300:5b::17) by HK2PR01MB3154.apcprd01.prod.exchangelabs.com (2603:1096:202:24::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.22; Mon, 31 May 2021 12:21:22 +0000 Received: from HK2APC01FT021.eop-APC01.prod.protection.outlook.com (2603:1096:300:5b:cafe::6a) by PS2PR03CA0005.outlook.office365.com (2603:1096:300:5b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.9 via Frontend Transport; Mon, 31 May 2021 12:21:22 +0000 Received: from ME3PR01MB5781.ausprd01.prod.outlook.com (2a01:111:e400:7ebc::52) by HK2APC01FT021.mail.protection.outlook.com (2a01:111:e400:7ebc::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.28 via Frontend Transport; Mon, 31 May 2021 12:21:22 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:6B570A5C79F14664E179AE93DCFE94FC744A89FCB3E7DC73937BC239CB89F3F7; UpperCasedChecksum:A84D6A949FAD2B67A201BEE16D8FF38395CBBA5FDD14007623EA3F94E2347B76; SizeAsReceived:8451; 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.030; Mon, 31 May 2021 12:21:22 +0000 To: ovs-dev@openvswitch.org From: miter Message-ID: Date: Mon, 31 May 2021 20:20:57 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 X-TMN: [y6QJmNVQnwCQv4ds2qxRhHCzoaEEFNtJ] X-ClientProxiedBy: HK2PR06CA0021.apcprd06.prod.outlook.com (2603:1096:202:2e::33) 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 HK2PR06CA0021.apcprd06.prod.outlook.com (2603:1096:202:2e::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Mon, 31 May 2021 12:21:21 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 44 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 85334f78-30f5-47c4-7b0e-08d9242e9a13 X-MS-TrafficTypeDiagnostic: HK2PR01MB3154: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ap+h4M6xh40CNQ0gXeLKXW/jqsSHpKQmOhHaZLmzJt6NOre6DFPttw5F4aG+lg40D5USrUw623d9+s/wK7btcPBRFV8D1oeYXzCGVpTp7qJQFsbAzisndVZwglxx5Spem6wZVKcv2hFrkEE+JskWpbxEEhwLM8RaozkP79Jx8lSPaVyZfMYXp81mqkJYGYvTxs8r7Geg4fSxLtxhltO1IEaQHiZ7mcpcWYx7ae60uNdF8lPswGzuTXI57jhgGDjTzMnsbg5Y9oSxeJxbi/OD1nW4rcacE47CJDedlybHmQTu0oPuTH4xSgC/oZuhKXcSiqpupzO8lG/2BCf7h/jTXv+oAk/xQDwfxw5oSYNTcgKwsvhAsiAtzRI6D5zNiwcp X-MS-Exchange-AntiSpam-MessageData: I7m+OdbdrJENp2zqZ+jMSSY9xg7/LQnwAUqXyMOkG0n+NjwiwwMi5U6+RGUdk8WgYGKyWv4i06lFNwXNWW3fwEcOUJApU8EIxkAcNj4glZ9D7Ga0iudsyYYgsUf3BXgJsABgyL0G6rOednOVo63h/A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85334f78-30f5-47c4-7b0e-08d9242e9a13 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2021 12:21:22.3391 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HK2APC01FT021.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: HK2PR01MB3154 Subject: [ovs-dev] [PATCH] fix coding style in bridge_configure_rstp() function. 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" This patch fix the style of bridge_configure_rstp() function. Signed-off-by: linhuang ---  vswitchd/bridge.c | 6 ++----  1 file changed, 2 insertions(+), 4 deletions(-) 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);          }