chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fixate show_status earlier, so that we actually print the welcome message
[elogind.git]
/
src
/
network
/
networkd.h
diff --git
a/src/network/networkd.h
b/src/network/networkd.h
index 184f631ecfa39a564103d2e88aa20b1552146f14..51d77570d40ebab12c8900b4bd68a04da98674fa 100644
(file)
--- a/
src/network/networkd.h
+++ b/
src/network/networkd.h
@@
-22,7
+22,6
@@
#pragma once
#include <arpa/inet.h>
#pragma once
#include <arpa/inet.h>
-#include <linux/rtnetlink.h>
#include "sd-event.h"
#include "sd-rtnl.h"
#include "sd-event.h"
#include "sd-rtnl.h"
@@
-75,7
+74,7
@@
struct NetDev {
char *name;
NetDevKind kind;
char *name;
NetDevKind kind;
-
in
t vlanid;
+
uint64_
t vlanid;
int ifindex;
NetDevState state;
int ifindex;
NetDevState state;
@@
-97,7
+96,7
@@
struct Network {
char *description;
NetDev *bridge;
NetDev *bond;
char *description;
NetDev *bridge;
NetDev *bond;
-
NetDev *vlan
;
+
Hashmap *vlans
;
bool dhcp;
bool dhcp_dns;
bool dhcp_mtu;
bool dhcp;
bool dhcp_dns;
bool dhcp_mtu;