From: Luca Boccassi <bluca@debian.org>
Date: Tue, 16 Jan 2024 21:16:09 +0000 (+0000)
Subject: Merge pull request #30949 from yuwata/network-route-cosmetic-cleanups
X-Git-Tag: v256-rc1~1136
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eda07d7fcf309ea9286e89bfdf971cc7f8918be2;p=thirdparty%2Fsystemd.git

Merge pull request #30949 from yuwata/network-route-cosmetic-cleanups

network/route: several cosmetic cleanups
---

eda07d7fcf309ea9286e89bfdf971cc7f8918be2
diff --cc src/network/networkd-route.c
index adc920427be,b0406b75229..11fa26003ac
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@@ -699,13 -668,15 +713,15 @@@ int route_remove(Route *route) 
          link = route->link;
          manager = route->manager ?: link->manager;
  
 -        log_route_debug(route, "Removing", link, manager);
 +        log_route_debug(route, "Removing", manager);
  
-         r = sd_rtnl_message_new_route(manager->rtnl, &req,
-                                       RTM_DELROUTE, route->family,
-                                       route->protocol);
+         r = sd_rtnl_message_new_route(manager->rtnl, &m, RTM_DELROUTE, route->family, route->protocol);
+         if (r < 0)
+                 return log_link_warning_errno(link, r, "Could not create netlink message: %m");
+ 
+         r = route_set_netlink_message(route, m, link);
          if (r < 0)
-                 return log_link_error_errno(link, r, "Could not create netlink message: %m");
+                 return log_link_warning_errno(link, r, "Could not fill netlink message: %m");
  
          if (route->family == AF_INET && route->nexthop_id > 0 && route->type == RTN_BLACKHOLE)
                  /* When IPv4 route has nexthop id and the nexthop type is blackhole, even though kernel