From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 16 Feb 2025 20:40:56 +0000 (+0900)
Subject: network/bridge-mdb: drop workaround for MDB entry on bridge
X-Git-Tag: v258-rc1~1307^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d1a8da71968d0b41a40d815332e0f764cf597f1;p=thirdparty%2Fsystemd.git

network/bridge-mdb: drop workaround for MDB entry on bridge

Our kernel base line is now v5.4.
---

diff --git a/src/network/networkd-bridge-mdb.c b/src/network/networkd-bridge-mdb.c
index 358ca4d2947..80ef3c14585 100644
--- a/src/network/networkd-bridge-mdb.c
+++ b/src/network/networkd-bridge-mdb.c
@@ -90,13 +90,7 @@ static int bridge_mdb_configure_handler(sd_netlink *rtnl, sd_netlink_message *m,
         assert(link);
 
         r = sd_netlink_message_get_errno(m);
-        if (r == -EINVAL && streq_ptr(link->kind, "bridge") && link->master_ifindex <= 0) {
-                /* To configure bridge MDB entries on bridge master, 1bc844ee0faa1b92e3ede00bdd948021c78d7088 (v5.4) is required. */
-                if (!link->manager->bridge_mdb_on_master_not_supported) {
-                        log_link_warning_errno(link, r, "Kernel seems not to support bridge MDB entries on bridge master, ignoring: %m");
-                        link->manager->bridge_mdb_on_master_not_supported = true;
-                }
-        } else if (r < 0 && r != -EEXIST) {
+        if (r < 0 && r != -EEXIST) {
                 log_link_message_warning_errno(link, m, r, "Could not add MDB entry");
                 link_enter_failed(link);
                 return 1;
diff --git a/src/network/networkd-manager.h b/src/network/networkd-manager.h
index 9891b8c1fc0..59e07748c64 100644
--- a/src/network/networkd-manager.h
+++ b/src/network/networkd-manager.h
@@ -118,8 +118,6 @@ struct Manager {
         usec_t speed_meter_usec_new;
         usec_t speed_meter_usec_old;
 
-        bool bridge_mdb_on_master_not_supported;
-
         FirewallContext *fw_ctx;
 
         bool request_queued;