summaryrefslogtreecommitdiff
path: root/src/network/netdev
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2016-11-13 04:59:06 +0100
committerTom Gundersen <teg@jklm.no>2016-11-14 01:05:06 +0100
commit23f53b99b17f1b8dc755a6c0fff41b1ed3069467 (patch)
tree8b18b8a09885648ac106c45b0cacc0cfd0bbf750 /src/network/netdev
parent441e9ae4d96ab8530a1416ba7ede9eee44d35f2d (diff)
networkd: clean up main header file a bit
Rename networkd.h to networkd-manager.h, to more accurately describe what it contains.
Diffstat (limited to 'src/network/netdev')
-rw-r--r--src/network/netdev/bridge.c2
-rw-r--r--src/network/netdev/netdev.c15
2 files changed, 15 insertions, 2 deletions
diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
index 760aefd97e..08e31b974f 100644
--- a/src/network/netdev/bridge.c
+++ b/src/network/netdev/bridge.c
@@ -22,8 +22,8 @@
#include "missing.h"
#include "netlink-util.h"
-#include "networkd.h"
#include "netdev/bridge.h"
+#include "networkd-manager.h"
/* callback for brige netdev's parameter set */
static int netdev_bridge_set_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index 4f287bab72..9b9e83d9db 100644
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -27,12 +27,25 @@
#include "netlink-util.h"
#include "network-internal.h"
#include "netdev/netdev.h"
-#include "networkd.h"
+#include "networkd-manager.h"
#include "siphash24.h"
#include "stat-util.h"
#include "string-table.h"
#include "string-util.h"
+#include "netdev/bridge.h"
+#include "netdev/bond.h"
+#include "netdev/vlan.h"
+#include "netdev/macvlan.h"
+#include "netdev/ipvlan.h"
+#include "netdev/vxlan.h"
+#include "netdev/tunnel.h"
+#include "netdev/tuntap.h"
+#include "netdev/veth.h"
+#include "netdev/dummy.h"
+#include "netdev/vrf.h"
+#include "netdev/vcan.h"
+
const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = {
[NETDEV_KIND_BRIDGE] = &bridge_vtable,
[NETDEV_KIND_BOND] = &bond_vtable,