From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 29 Sep 2020 17:49:14 +0000 (+0900)
Subject: network: cleanup networkd-mdb.h
X-Git-Tag: v247-rc1~117^2~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dbf6319691207a1a384a52da982e8e83a21693cd;p=thirdparty%2Fsystemd.git

network: cleanup networkd-mdb.h
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index aa9c0c528ad..36f627c48c4 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -32,6 +32,7 @@
 #include "networkd-link.h"
 #include "networkd-lldp-tx.h"
 #include "networkd-manager.h"
+#include "networkd-mdb.h"
 #include "networkd-ndisc.h"
 #include "networkd-neighbor.h"
 #include "networkd-nexthop.h"
diff --git a/src/network/networkd-mdb.c b/src/network/networkd-mdb.c
index 31234ba3bc1..169cc6eb008 100644
--- a/src/network/networkd-mdb.c
+++ b/src/network/networkd-mdb.c
@@ -3,8 +3,10 @@
 #include <net/if.h>
 
 #include "netlink-util.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-mdb.h"
+#include "networkd-network.h"
 #include "string-util.h"
 #include "vlan-util.h"
 
diff --git a/src/network/networkd-mdb.h b/src/network/networkd-mdb.h
index b3d0513293d..e0d9052497d 100644
--- a/src/network/networkd-mdb.h
+++ b/src/network/networkd-mdb.h
@@ -1,24 +1,23 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
+#include <inttypes.h>
+
 #include "conf-parser.h"
-#include "list.h"
-#include "macro.h"
+#include "in-addr-util.h"
 #include "networkd-util.h"
 
 typedef struct Network Network;
-typedef struct MdbEntry MdbEntry;
 typedef struct Link Link;
-typedef struct NetworkConfigSection NetworkConfigSection;
 
-struct MdbEntry {
+typedef struct MdbEntry {
         Network *network;
         NetworkConfigSection *section;
 
         int family;
         union in_addr_union group_addr;
         uint16_t vlan_id;
-};
+} MdbEntry;
 
 MdbEntry *mdb_entry_free(MdbEntry *mdb_entry);
 
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index ac28de39aa4..51a1533554a 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -15,6 +15,7 @@ _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")
 #include "networkd-dhcp6.h"
 #include "networkd-fdb.h"
 #include "networkd-ipv4ll.h"
+#include "networkd-mdb.h"
 #include "networkd-ndisc.h"
 #include "networkd-network.h"
 #include "networkd-neighbor.h"
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 67acb1e7611..864eb1b4c99 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -17,6 +17,7 @@
 #include "networkd-address-label.h"
 #include "networkd-fdb.h"
 #include "networkd-manager.h"
+#include "networkd-mdb.h"
 #include "networkd-neighbor.h"
 #include "networkd-network.h"
 #include "networkd-nexthop.h"
diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
index e584e5d4605..9a2e3643037 100644
--- a/src/network/networkd-network.h
+++ b/src/network/networkd-network.h
@@ -21,7 +21,6 @@
 #include "networkd-ipv6-proxy-ndp.h"
 #include "networkd-lldp-rx.h"
 #include "networkd-lldp-tx.h"
-#include "networkd-mdb.h"
 #include "networkd-ndisc.h"
 #include "networkd-radv.h"
 #include "networkd-route.h"