diff options
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/net/link-config.c | 8 | ||||
| -rw-r--r-- | src/udev/udev-event.c | 4 | ||||
| -rw-r--r-- | src/udev/udev.h | 4 | ||||
| -rw-r--r-- | src/udev/udevd.c | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 5610b2808e..63e54db56e 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -28,14 +28,14 @@ #include "ethtool-util.h" #include "libudev-private.h" -#include "sd-rtnl.h" +#include "sd-netlink.h" #include "util.h" #include "log.h" #include "strv.h" #include "path-util.h" #include "conf-parser.h" #include "conf-files.h" -#include "rtnl-util.h" +#include "netlink-util.h" #include "network-internal.h" #include "random-util.h" @@ -46,7 +46,7 @@ struct link_config_ctx { bool enable_name_policy; - sd_rtnl *rtnl; + sd_netlink *rtnl; usec_t link_dirs_ts_usec; }; @@ -103,7 +103,7 @@ void link_config_ctx_free(link_config_ctx *ctx) { safe_close(ctx->ethtool_fd); - sd_rtnl_unref(ctx->rtnl); + sd_netlink_unref(ctx->rtnl); link_configs_free(ctx); diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index cc97a8867e..5516a792eb 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -30,7 +30,7 @@ #include <sys/wait.h> #include <sys/signalfd.h> -#include "rtnl-util.h" +#include "netlink-util.h" #include "event-util.h" #include "formats-util.h" #include "process-util.h" @@ -63,7 +63,7 @@ struct udev_event *udev_event_new(struct udev_device *dev) { void udev_event_unref(struct udev_event *event) { if (event == NULL) return; - sd_rtnl_unref(event->rtnl); + sd_netlink_unref(event->rtnl); udev_list_cleanup(&event->run_list); udev_list_cleanup(&event->seclabel_list); free(event->program_result); diff --git a/src/udev/udev.h b/src/udev/udev.h index 4d22f2377e..3dca72e499 100644 --- a/src/udev/udev.h +++ b/src/udev/udev.h @@ -22,7 +22,7 @@ #include <sys/param.h> #include "macro.h" -#include "sd-rtnl.h" +#include "sd-netlink.h" #include "libudev.h" #include "libudev-private.h" #include "util.h" @@ -43,7 +43,7 @@ struct udev_event { struct udev_list run_list; int exec_delay; usec_t birth_usec; - sd_rtnl *rtnl; + sd_netlink *rtnl; unsigned int builtin_run; unsigned int builtin_ret; bool inotify_watch; diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 26aae89990..2b1dbb8bf1 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -45,7 +45,7 @@ #include "signal-util.h" #include "event-util.h" -#include "rtnl-util.h" +#include "netlink-util.h" #include "cgroup-util.h" #include "process-util.h" #include "dev-setup.h" @@ -339,7 +339,7 @@ static void worker_spawn(Manager *manager, struct event *event) { switch (pid) { case 0: { struct udev_device *dev = NULL; - _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL; + _cleanup_netlink_unref_ sd_netlink *rtnl = NULL; int fd_monitor; _cleanup_close_ int fd_signal = -1, fd_ep = -1; struct epoll_event ep_signal = { .events = EPOLLIN }; @@ -455,7 +455,7 @@ static void worker_spawn(Manager *manager, struct event *event) { if (udev_event->rtnl) /* in case rtnl was initialized */ - rtnl = sd_rtnl_ref(udev_event->rtnl); + rtnl = sd_netlink_ref(udev_event->rtnl); /* apply/restore inotify watch */ if (udev_event->inotify_watch) { @@ -875,7 +875,7 @@ static int on_worker(sd_event_source *s, int fd, uint32_t revents, void *userdat continue; } - for (cmsg = CMSG_FIRSTHDR(&msghdr); cmsg; cmsg = CMSG_NXTHDR(&msghdr, cmsg)) { + CMSG_FOREACH(cmsg, &msghdr) { if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS && cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred))) |