From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 8 Nov 2021 00:51:20 +0000 (+0900)
Subject: network/bridge: drop if_bridge.h from bridge.h
X-Git-Tag: v250-rc1~326^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad851caebdd497b8aa877e99dff33251813c0ffc;p=thirdparty%2Fsystemd.git

network/bridge: drop if_bridge.h from bridge.h

To avoid future header conflicts.
---

diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
index 99fb9e1c3c1..a4d68985b84 100644
--- a/src/network/netdev/bridge.c
+++ b/src/network/netdev/bridge.c
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
+#include <netinet/in.h>
+#include <linux/if_bridge.h>
 
 #include "bridge.h"
 #include "netlink-util.h"
@@ -8,11 +10,16 @@
 #include "string-table.h"
 #include "vlan-util.h"
 
+assert_cc((int) MULTICAST_ROUTER_NONE            == (int) MDB_RTR_TYPE_DISABLED);
+assert_cc((int) MULTICAST_ROUTER_TEMPORARY_QUERY == (int) MDB_RTR_TYPE_TEMP_QUERY);
+assert_cc((int) MULTICAST_ROUTER_PERMANENT       == (int) MDB_RTR_TYPE_PERM);
+assert_cc((int) MULTICAST_ROUTER_TEMPORARY       == (int) MDB_RTR_TYPE_TEMP);
+
 static const char* const multicast_router_table[_MULTICAST_ROUTER_MAX] = {
-        [MULTICAST_ROUTER_NONE] = "no",
+        [MULTICAST_ROUTER_NONE]            = "no",
         [MULTICAST_ROUTER_TEMPORARY_QUERY] = "query",
-        [MULTICAST_ROUTER_PERMANENT] = "permanent",
-        [MULTICAST_ROUTER_TEMPORARY] = "temporary",
+        [MULTICAST_ROUTER_PERMANENT]       = "permanent",
+        [MULTICAST_ROUTER_TEMPORARY]       = "temporary",
 };
 
 DEFINE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(multicast_router, MulticastRouter, _MULTICAST_ROUTER_INVALID);
diff --git a/src/network/netdev/bridge.h b/src/network/netdev/bridge.h
index 4510842022b..a6f32240441 100644
--- a/src/network/netdev/bridge.h
+++ b/src/network/netdev/bridge.h
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <netinet/in.h>
-#include <linux/if_bridge.h>
-
 #include "conf-parser.h"
 #include "netdev.h"
 
@@ -30,10 +27,10 @@ typedef struct Bridge {
 } Bridge;
 
 typedef enum MulticastRouter {
-        MULTICAST_ROUTER_NONE            = MDB_RTR_TYPE_DISABLED,
-        MULTICAST_ROUTER_TEMPORARY_QUERY = MDB_RTR_TYPE_TEMP_QUERY,
-        MULTICAST_ROUTER_PERMANENT       = MDB_RTR_TYPE_PERM,
-        MULTICAST_ROUTER_TEMPORARY       = MDB_RTR_TYPE_TEMP,
+        MULTICAST_ROUTER_NONE,
+        MULTICAST_ROUTER_TEMPORARY_QUERY,
+        MULTICAST_ROUTER_PERMANENT,
+        MULTICAST_ROUTER_TEMPORARY,
         _MULTICAST_ROUTER_MAX,
         _MULTICAST_ROUTER_INVALID = -EINVAL,
 } MulticastRouter;
diff --git a/src/network/networkd-bridge-mdb.c b/src/network/networkd-bridge-mdb.c
index ed8a10cad80..10025a97aeb 100644
--- a/src/network/networkd-bridge-mdb.c
+++ b/src/network/networkd-bridge-mdb.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
+#include <linux/if_bridge.h>
 
 #include "netlink-util.h"
 #include "networkd-bridge-mdb.h"
diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c
index 54243e79686..cc44b400b2e 100644
--- a/src/network/networkd-setlink.c
+++ b/src/network/networkd-setlink.c
@@ -3,6 +3,7 @@
 #include <netinet/in.h>
 #include <linux/if.h>
 #include <linux/if_arp.h>
+#include <linux/if_bridge.h>
 
 #include "missing_network.h"
 #include "netlink-util.h"