]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: drop route_expire_callback() as it is duplicate of link_route_remove_handler()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 10 Oct 2018 05:32:52 +0000 (14:32 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 10 Oct 2018 05:43:05 +0000 (14:43 +0900)
src/network/networkd-route.c

index 16a30b5731d22f9d1f9c9ca95d5846e6a4f9fd78..f0b72c78f4ef95d22d4b65ec00d44070bd3364ad 100644 (file)
@@ -449,32 +449,13 @@ int route_remove(Route *route, Link *link,
         return 0;
 }
 
-static int route_expire_callback(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
-        Link *link = userdata;
-        int r;
-
-        assert(rtnl);
-        assert(m);
-        assert(link);
-        assert(link->ifname);
-
-        if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
-                return 1;
-
-        r = sd_netlink_message_get_errno(m);
-        if (r < 0 && r != -EEXIST)
-                log_link_warning_errno(link, r, "could not remove route: %m");
-
-        return 1;
-}
-
 int route_expire_handler(sd_event_source *s, uint64_t usec, void *userdata) {
         Route *route = userdata;
         int r;
 
         assert(route);
 
-        r = route_remove(route, route->link, route_expire_callback);
+        r = route_remove(route, route->link, link_route_remove_handler);
         if (r < 0)
                 log_warning_errno(r, "Could not remove route: %m");
         else