]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #30949 from yuwata/network-route-cosmetic-cleanups
authorLuca Boccassi <bluca@debian.org>
Tue, 16 Jan 2024 21:16:09 +0000 (21:16 +0000)
committerGitHub <noreply@github.com>
Tue, 16 Jan 2024 21:16:09 +0000 (21:16 +0000)
network/route: several cosmetic cleanups

1  2 
src/network/networkd-route.c

index adc920427be946f414c9acc78e0451aa3606b9d0,b0406b75229639a22c7154ca296ac71c38d0c20f..11fa26003ac71686facf2b8779749dbdf0873421
@@@ -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