chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-event: make sd_event_add_signal() fail with EBUSY if signal is not blocked
[elogind.git]
/
src
/
network
/
networkd.h
diff --git
a/src/network/networkd.h
b/src/network/networkd.h
index 075cc1275ef0c47d8a4150a8dbea503abde368d2..c28c90f0e34f7bb5ccd9a74e1191c1c417bd6482 100644
(file)
--- a/
src/network/networkd.h
+++ b/
src/network/networkd.h
@@
-133,11
+133,9
@@
struct Route {
};
typedef enum LinkState {
};
typedef enum LinkState {
- LINK_STATE_JOIN_BRIDGE,
- LINK_STATE_BRIDGE_JOINED,
- LINK_STATE_SET_ADDRESSES,
- LINK_STATE_ADDRESSES_SET,
- LINK_STATE_SET_ROUTES,
+ LINK_STATE_JOINING_BRIDGE,
+ LINK_STATE_SETTING_ADDRESSES,
+ LINK_STATE_SETTING_ROUTES,
LINK_STATE_CONFIGURED,
LINK_STATE_FAILED,
_LINK_STATE_MAX,
LINK_STATE_CONFIGURED,
LINK_STATE_FAILED,
_LINK_STATE_MAX,
@@
-263,7
+261,7
@@
void link_free(Link *link);
int link_add(Manager *manager, struct udev_device *device);
int link_configure(Link *link);
int link_add(Manager *manager, struct udev_device *device);
int link_configure(Link *link);
-int link_update
_flags(Link *link, unsigned flags
);
+int link_update
(Link *link, sd_rtnl_message *message
);
DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free);
#define _cleanup_link_free_ _cleanup_(link_freep)
DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free);
#define _cleanup_link_free_ _cleanup_(link_freep)