From 1cc84f3bb91aafc18d30e8b4567e46e76cb41f44 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 24 Jan 2019 12:07:41 +0900 Subject: [PATCH 1/2] network: make link_up() static --- src/network/networkd-link.c | 2 +- src/network/networkd-link.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index ae0fc8403e..555e90f5ce 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1775,7 +1775,7 @@ static int link_up_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) return 1; } -int link_up(Link *link) { +static int link_up(Link *link) { _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL; uint8_t ipv6ll_mode; int r; diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h index e417ea26ef..dcb1ea68dd 100644 --- a/src/network/networkd-link.h +++ b/src/network/networkd-link.h @@ -143,7 +143,6 @@ int link_get(Manager *m, int ifindex, Link **ret); int link_add(Manager *manager, sd_netlink_message *message, Link **ret); void link_drop(Link *link); -int link_up(Link *link); int link_down(Link *link); void link_enter_failed(Link *link); From 15cdaeee2e98b4f9afb4eedaa5c7e045cec39913 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 24 Jan 2019 14:33:58 +0900 Subject: [PATCH 2/2] network: fix an error log --- src/network/netdev/bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c index 0c804adb2e..aadb3ab905 100644 --- a/src/network/netdev/bridge.c +++ b/src/network/netdev/bridge.c @@ -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); 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)); if (r < 0)