From 754252f9231adad1993ca010d5b79f8fe54f8e3b Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 10 Jul 2023 10:06:08 +0900 Subject: network: rename sd_netlink_message* req -> m This also merges neighbor_configure_message() with neighbor_configure(). --- src/network/networkd-nexthop.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/network/networkd-nexthop.c') diff --git a/src/network/networkd-nexthop.c b/src/network/networkd-nexthop.c index eed28440c2..42b48198af 100644 --- a/src/network/networkd-nexthop.c +++ b/src/network/networkd-nexthop.c @@ -388,7 +388,7 @@ static int nexthop_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Link } static int nexthop_remove(NextHop *nexthop) { - _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL; + _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL; Manager *manager; Link *link; int r; @@ -407,15 +407,15 @@ static int nexthop_remove(NextHop *nexthop) { log_nexthop_debug(nexthop, "Removing", link); - r = sd_rtnl_message_new_nexthop(manager->rtnl, &req, RTM_DELNEXTHOP, AF_UNSPEC, RTPROT_UNSPEC); + r = sd_rtnl_message_new_nexthop(manager->rtnl, &m, RTM_DELNEXTHOP, AF_UNSPEC, RTPROT_UNSPEC); if (r < 0) return log_link_error_errno(link, r, "Could not create RTM_DELNEXTHOP message: %m"); - r = sd_netlink_message_append_u32(req, NHA_ID, nexthop->id); + r = sd_netlink_message_append_u32(m, NHA_ID, nexthop->id); if (r < 0) return log_link_error_errno(link, r, "Could not append NHA_ID attribute: %m"); - r = netlink_call_async(manager->rtnl, NULL, req, nexthop_remove_handler, + r = netlink_call_async(manager->rtnl, NULL, m, nexthop_remove_handler, link ? link_netlink_destroy_callback : NULL, link); if (r < 0) return log_link_error_errno(link, r, "Could not send rtnetlink message: %m"); -- cgit v1.2.3