morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 17:06:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

networkd: rename link_update_flags to link_update

Browse Source 
We are likely to track more than the flags in the future.
This commit is contained in:
Tom Gundersen
2013-12-17 18:36:09 +01:00
parent 2b49a47041
commit 22936833e1
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/networkd-link.c
View File

@@ -391,8 +391,18 @@ int link_configure(Link *link) {
return 0;
}
int link_update_flags(Link *link, unsigned flags) {
int link_update(Link *link, sd_rtnl_message *m) {
unsigned flags;
int r;
assert(link);
assert(m);
r = sd_rtnl_message_link_get_flags(m, &flags);
if (r < 0) {
log_warning("Could not get link flags of '%s'", link->ifname);
return r;
}
if (link->flags & IFF_UP && !(flags & IFF_UP))
log_info("Interface '%s' is down", link->ifname);

7
src/network/networkd-manager.c
View File

@@ -243,7 +243,6 @@ int manager_udev_listen(Manager *m) {
static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) {
Manager *m = userdata;
Link *link;
unsigned flags;
int r, ifindex;
r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
@@ -254,11 +253,7 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
if (!link)
return 0;
r = sd_rtnl_message_link_get_flags(message, &flags);
if (r < 0)
return 0;
r = link_update_flags(link, flags);
r = link_update(link, message);
if (r < 0)
return 0;

2
src/network/networkd.h
View File

@@ -263,7 +263,7 @@ void link_free(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)