From 5bb4542b0c93f9e9b57f388b8f191945d192dba3 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 30 Sep 2020 02:05:08 +0900
Subject: [PATCH] network: move link_set_bridge_fdb()

---
 src/network/networkd-fdb.c  | 18 +++++++++++++++++-
 src/network/networkd-fdb.h  |  3 ++-
 src/network/networkd-link.c | 13 -------------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c
index 0337ec24a5..792e02a066 100644
--- a/src/network/networkd-fdb.c
+++ b/src/network/networkd-fdb.c
@@ -122,7 +122,7 @@ static int set_fdb_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link)
 }
 
 /* send a request to the kernel to add a FDB entry in its static MAC table. */
-int fdb_entry_configure(Link *link, FdbEntry *fdb_entry) {
+static int fdb_entry_configure(Link *link, FdbEntry *fdb_entry) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
         int r;
 
@@ -179,6 +179,22 @@ int fdb_entry_configure(Link *link, FdbEntry *fdb_entry) {
         return 1;
 }
 
+int link_set_bridge_fdb(Link *link) {
+        FdbEntry *fdb_entry;
+        int r;
+
+        assert(link);
+        assert(link->network);
+
+        HASHMAP_FOREACH(fdb_entry, link->network->fdb_entries_by_section) {
+                r = fdb_entry_configure(link, fdb_entry);
+                if (r < 0)
+                        return log_link_error_errno(link, r, "Failed to add MAC entry to static MAC table: %m");
+        }
+
+        return 0;
+}
+
 /* parse the HW address from config files. */
 int config_parse_fdb_hwaddr(
                 const char *unit,
diff --git a/src/network/networkd-fdb.h b/src/network/networkd-fdb.h
index c6b5055f8e..faddcf604e 100644
--- a/src/network/networkd-fdb.h
+++ b/src/network/networkd-fdb.h
@@ -42,7 +42,8 @@ struct FdbEntry {
 };
 
 FdbEntry *fdb_entry_free(FdbEntry *fdb_entry);
-int fdb_entry_configure(Link *link, FdbEntry *fdb_entry);
+
+int link_set_bridge_fdb(Link *link);
 
 const char* fdb_ntf_flags_to_string(NeighborCacheEntryFlags i) _const_;
 NeighborCacheEntryFlags fdb_ntf_flags_from_string(const char *s) _pure_;
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index c47bf75cdf..2282749fa6 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1132,19 +1132,6 @@ void link_check_ready(Link *link) {
         return;
 }
 
-static int link_set_bridge_fdb(Link *link) {
-        FdbEntry *fdb_entry;
-        int r;
-
-        HASHMAP_FOREACH(fdb_entry, link->network->fdb_entries_by_section) {
-                r = fdb_entry_configure(link, fdb_entry);
-                if (r < 0)
-                        return log_link_error_errno(link, r, "Failed to add MAC entry to static MAC table: %m");
-        }
-
-        return 0;
-}
-
 static int static_address_ready_callback(Address *address) {
         Address *a;
         Link *link;