From 46205ffcdfb65342a695646a1794d32984606051 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 15 Sep 2020 16:07:45 +0900 Subject: [PATCH] network: drop [BridgeMDB] entries if Bridge= is not set --- src/network/networkd-link.c | 8 -------- src/network/networkd-network.c | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 297b26cb69..4ab003280a 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1261,14 +1261,6 @@ static int link_set_bridge_mdb(Link *link) { if (!link->network) return 0; - if (LIST_IS_EMPTY(link->network->static_mdb_entries)) - return 0; - - if (!link->network->bridge) { - log_link_error(link, "Cannot configure MDB entries on non-bridge port"); - return 0; - } - LIST_FOREACH(static_mdb_entries, mdb_entry, link->network->static_mdb_entries) { r = mdb_entry_configure(link, mdb_entry); if (r < 0) diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 81876902f5..36d01283c0 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -306,6 +306,14 @@ int network_verify(Network *network) { if (section_is_invalid(fdb->section)) fdb_entry_free(fdb); + if (!LIST_IS_EMPTY(network->static_mdb_entries) && !network->bridge) { + log_warning("%s: Cannot configure MDB entries on non-bridge port, ignoring [BridgeMDB] sections.", + network->filename); + + while ((mdb = network->static_mdb_entries)) + mdb_entry_free(mdb); + } + LIST_FOREACH_SAFE(static_mdb_entries, mdb, mdb_next, network->static_mdb_entries) if (mdb_entry_verify(mdb) < 0) mdb_entry_free(mdb);