shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Code

Merge pull request #11547 from yuwata/network-cosmetic-fixes

Browse Source 
network: trivial fix and cleanup
This commit is contained in:
Lennart Poettering 2019-01-25 00:18:45 +01:00 committed by GitHub
commit 42a1491503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/netdev/bridge.c
View File

@ -47,7 +47,7 @@ static int netdev_bridge_post_create(NetDev *netdev, Link *link, sd_netlink_mess
r = sd_netlink_message_open_container(req, IFLA_LINKINFO); r = sd_netlink_message_open_container(req, IFLA_LINKINFO);
if (r < 0) if (r < 0)
return log_netdev_error_errno(netdev, r, "Could not append IFLA_PROTINFO attribute: %m"); return log_netdev_error_errno(netdev, r, "Could not append IFLA_LINKINFO attribute: %m");
r = sd_netlink_message_open_container_union(req, IFLA_INFO_DATA, netdev_kind_to_string(netdev->kind)); r = sd_netlink_message_open_container_union(req, IFLA_INFO_DATA, netdev_kind_to_string(netdev->kind));
if (r < 0) if (r < 0)

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

@ -1775,7 +1775,7 @@ static int link_up_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link)
return 1; return 1;
} }
int link_up(Link *link) { static int link_up(Link *link) {
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL; _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
uint8_t ipv6ll_mode; uint8_t ipv6ll_mode;
int r; int r;

1
src/network/networkd-link.h
View File

@ -143,7 +143,6 @@ int link_get(Manager *m, int ifindex, Link **ret);
int link_add(Manager *manager, sd_netlink_message *message, Link **ret); int link_add(Manager *manager, sd_netlink_message *message, Link **ret);
void link_drop(Link *link); void link_drop(Link *link);
int link_up(Link *link);
int link_down(Link *link); int link_down(Link *link);
void link_enter_failed(Link *link); void link_enter_failed(Link *link);