From 2061ef85f1e76e75e8752db6f6ee8c35dffbb728 Mon Sep 17 00:00:00 2001
From: miter <linhu...@ruijie.com.cn>
Date: Wed, 26 May 2021 19:46:59 +0800
Subject: [PATCH] Fix bridge_configure_rstp if-else coding style.
Signed-off-by: linhuang <linhu...@ruijie.com.cn>
---
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);
}
--
2.25.1
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
