network: drop [BridgeMDB] entries if Bridge= is not set
This commit is contained in:
parent
03ae449015
commit
46205ffcdf
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue