chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolve-host: use the usual log message when encountering a dbus parse failure
[elogind.git]
/
src
/
network
/
networkd.h
diff --git
a/src/network/networkd.h
b/src/network/networkd.h
index 138b82d786e0873c8ca7c5639a3c0a1de1ebccaa..766297cffa6985f802b37cbf05f943d597290c13 100644
(file)
--- a/
src/network/networkd.h
+++ b/
src/network/networkd.h
@@
-81,10
+81,7
@@
struct Network {
char *description;
NetDev *bridge;
NetDev *bond;
char *description;
NetDev *bridge;
NetDev *bond;
- NetDev *tunnel;
- Hashmap *vlans;
- Hashmap *macvlans;
- Hashmap *vxlans;
+ Hashmap *stacked_netdevs;
DHCPSupport dhcp;
bool dhcp_dns;
bool dhcp_ntp;
DHCPSupport dhcp;
bool dhcp_dns;
bool dhcp_ntp;
@@
-113,7
+110,7
@@
struct Network {
struct Address {
Network *network;
struct Address {
Network *network;
- u
int64_t
section;
+ u
nsigned
section;
int family;
unsigned char prefixlen;
int family;
unsigned char prefixlen;
@@
-131,7
+128,7
@@
struct Address {
struct Route {
Network *network;
struct Route {
Network *network;
- u
int64_t
section;
+ u
nsigned
section;
int family;
unsigned char dst_prefixlen;
int family;
unsigned char dst_prefixlen;
@@
-173,7
+170,7
@@
struct Link {
int n_ref;
int n_ref;
-
uint64_
t ifindex;
+
in
t ifindex;
char *ifname;
char *state_file;
struct ether_addr mac;
char *ifname;
char *state_file;
struct ether_addr mac;