shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-31 07:51:21 +03:00
Code

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

Browse Source 
To avoid future header conflicts.
This commit is contained in:
Yu Watanabe 2021-11-08 09:51:20 +09:00
parent fddb337cc8
commit ad851caebd
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/netdev/bridge.c
View File

@ -1,6 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <net/if.h> #include <net/if.h>
#include <netinet/in.h>
#include <linux/if_bridge.h>
#include "bridge.h" #include "bridge.h"
#include "netlink-util.h" #include "netlink-util.h"
@ -8,6 +10,11 @@
#include "string-table.h" #include "string-table.h"
#include "vlan-util.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] = { 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_TEMPORARY_QUERY] = "query",

11
src/network/netdev/bridge.h
View File

@ -1,9 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once #pragma once
#include <netinet/in.h>
#include <linux/if_bridge.h>
#include "conf-parser.h" #include "conf-parser.h"
#include "netdev.h" #include "netdev.h"
@ -30,10 +27,10 @@ typedef struct Bridge {
} Bridge; } Bridge;
typedef enum MulticastRouter { typedef enum MulticastRouter {
MULTICAST_ROUTER_NONE = MDB_RTR_TYPE_DISABLED, MULTICAST_ROUTER_NONE,
MULTICAST_ROUTER_TEMPORARY_QUERY = MDB_RTR_TYPE_TEMP_QUERY, MULTICAST_ROUTER_TEMPORARY_QUERY,
MULTICAST_ROUTER_PERMANENT = MDB_RTR_TYPE_PERM, MULTICAST_ROUTER_PERMANENT,
MULTICAST_ROUTER_TEMPORARY = MDB_RTR_TYPE_TEMP, MULTICAST_ROUTER_TEMPORARY,
_MULTICAST_ROUTER_MAX, _MULTICAST_ROUTER_MAX,
_MULTICAST_ROUTER_INVALID = -EINVAL, _MULTICAST_ROUTER_INVALID = -EINVAL,
} MulticastRouter; } MulticastRouter;

1
src/network/networkd-bridge-mdb.c
View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <net/if.h> #include <net/if.h>
#include <linux/if_bridge.h>
#include "netlink-util.h" #include "netlink-util.h"
#include "networkd-bridge-mdb.h" #include "networkd-bridge-mdb.h"

1
src/network/networkd-setlink.c
View File

@ -3,6 +3,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <linux/if.h> #include <linux/if.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/if_bridge.h>
#include "missing_network.h" #include "missing_network.h"
#include "netlink-util.h" #include "netlink-util.h"