network: move mdb_entry_free() and friends

diff --git a/src/network/networkd-mdb.c b/src/network/networkd-mdb.c
index 542ba75ad0f8ab51a4218730f6f74c5911b7fb72..0ac770264cdeb885cb66077db146d9837e11b7f0 100644 (file)
--- a/src/network/networkd-mdb.c
+++ b/src/network/networkd-mdb.c
@@ -10,6 +10,27 @@
 
 #define STATIC_MDB_ENTRIES_PER_NETWORK_MAX 1024U
 
+/* remove MDB entry. */
+MdbEntry *mdb_entry_free(MdbEntry *mdb_entry) {
+        if (!mdb_entry)
+                return NULL;
+
+        if (mdb_entry->network) {
+                LIST_REMOVE(static_mdb_entries, mdb_entry->network->static_mdb_entries, mdb_entry);
+                assert(mdb_entry->network->n_static_mdb_entries > 0);
+                mdb_entry->network->n_static_mdb_entries--;
+
+                if (mdb_entry->section)
+                        hashmap_remove(mdb_entry->network->mdb_entries_by_section, mdb_entry->section);
+        }
+
+        network_config_section_free(mdb_entry->section);
+
+        return mfree(mdb_entry);
+}
+
+DEFINE_NETWORK_SECTION_FUNCTIONS(MdbEntry, mdb_entry_free);
+
 /* create a new MDB entry or get an existing one. */
 static int mdb_entry_new_static(
                 Network *network,
@@ -72,25 +93,6 @@ static int mdb_entry_new_static(
         return 0;
 }
 
-/* remove and MDB entry. */
-MdbEntry *mdb_entry_free(MdbEntry *mdb_entry) {
-        if (!mdb_entry)
-                return NULL;
-
-        if (mdb_entry->network) {
-                LIST_REMOVE(static_mdb_entries, mdb_entry->network->static_mdb_entries, mdb_entry);
-                assert(mdb_entry->network->n_static_mdb_entries > 0);
-                mdb_entry->network->n_static_mdb_entries--;
-
-                if (mdb_entry->section)
-                        hashmap_remove(mdb_entry->network->mdb_entries_by_section, mdb_entry->section);
-        }
-
-        network_config_section_free(mdb_entry->section);
-
-        return mfree(mdb_entry);
-}
-
 static int set_mdb_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
         int r;
 

diff --git a/src/network/networkd-mdb.h b/src/network/networkd-mdb.h
index d46ab4a50e0ecee0d6490508aeb40cf6e559eca2..70250b5d4550f89d42755f8e5685eb518557516d 100644 (file)
--- a/src/network/networkd-mdb.h
+++ b/src/network/networkd-mdb.h
@@ -26,7 +26,5 @@ int mdb_entry_verify(MdbEntry *mdb_entry);
 MdbEntry *mdb_entry_free(MdbEntry *mdb_entry);
 int link_set_bridge_mdb(Link *link);
 
-DEFINE_NETWORK_SECTION_FUNCTIONS(MdbEntry, mdb_entry_free);
-
 CONFIG_PARSER_PROTOTYPE(config_parse_mdb_group_address);
 CONFIG_PARSER_PROTOTYPE(config_parse_mdb_vlan_id);