SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: adjust log messages, function names, etc.

Browse Source
This commit is contained in:
Yu Watanabe
2021-08-12 14:39:39 +09:00
parent 8f65304c5d
commit b14686ff3a
5 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/netdev/netdev.c
+7 -7
View File
@@ -595,12 +595,12 @@ static bool netdev_is_ready_to_create(NetDev *netdev, Link *link) {
return true;
}
int request_process_create_stacked_netdev(Request *req) {
int request_process_stacked_netdev(Request *req) {
int r;
assert(req);
assert(req->link);
assert(req->type == REQUEST_TYPE_CREATE_STACKED_NETDEV);
assert(req->type == REQUEST_TYPE_STACKED_NETDEV);
assert(req->netdev);
assert(req->netlink_handler);
@@ -667,7 +667,7 @@ static int link_create_stacked_netdev_after_configured_handler(sd_netlink *rtnl,
return 0;
}
int link_request_to_crate_stacked_netdev(Link *link, NetDev *netdev) {
int link_request_stacked_netdev(Link *link, NetDev *netdev) {
NetDevCreateType create_type;
int r;
@@ -684,22 +684,22 @@ int link_request_to_crate_stacked_netdev(Link *link, NetDev *netdev) {
if (create_type == NETDEV_CREATE_STACKED) {
link->stacked_netdevs_created = false;
r = link_queue_request(link, REQUEST_TYPE_CREATE_STACKED_NETDEV, netdev, false,
r = link_queue_request(link, REQUEST_TYPE_STACKED_NETDEV, netdev, false,
&link->create_stacked_netdev_messages,
link_create_stacked_netdev_handler,
NULL);
} else {
link->stacked_netdevs_after_configured_created = false;
r = link_queue_request(link, REQUEST_TYPE_CREATE_STACKED_NETDEV, netdev, false,
r = link_queue_request(link, REQUEST_TYPE_STACKED_NETDEV, netdev, false,
&link->create_stacked_netdev_after_configured_messages,
link_create_stacked_netdev_after_configured_handler,
NULL);
}
if (r < 0)
return log_link_error_errno(link, r, "Failed to request to create stacked netdev '%s': %m",
return log_link_error_errno(link, r, "Failed to request stacked netdev '%s': %m",
netdev->ifname);
log_link_debug(link, "Requested to create stacked netdev '%s'", netdev->ifname);
log_link_debug(link, "Requested stacked netdev '%s'", netdev->ifname);
return 0;
}
src/network/netdev/netdev.h
+2 -2
View File
@@ -197,8 +197,8 @@ int netdev_set_ifindex(NetDev *netdev, sd_netlink_message *newlink);
int netdev_get_mac(const char *ifname, struct ether_addr **ret);
int netdev_join(NetDev *netdev, Link *link, link_netlink_message_handler_t cb);
int request_process_create_stacked_netdev(Request *req);
int link_request_to_crate_stacked_netdev(Link *link, NetDev *netdev);
int request_process_stacked_netdev(Request *req);
int link_request_stacked_netdev(Link *link, NetDev *netdev);
const char *netdev_kind_to_string(NetDevKind d) _const_;
NetDevKind netdev_kind_from_string(const char *d) _pure_;