From: Yu Watanabe Date: Mon, 18 Oct 2021 16:49:53 +0000 (+0900) Subject: tree-wide: use AF_NETLINK instead of PF_NETLINK X-Git-Tag: v250-rc1~481 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0522729e19f140c7a8f33aeebe9959e5bc7dd135;p=thirdparty%2Fsystemd.git tree-wide: use AF_NETLINK instead of PF_NETLINK --- diff --git a/src/libsystemd/sd-device/device-monitor.c b/src/libsystemd/sd-device/device-monitor.c index 2cb35951de2..a446c27583e 100644 --- a/src/libsystemd/sd-device/device-monitor.c +++ b/src/libsystemd/sd-device/device-monitor.c @@ -143,7 +143,7 @@ int device_monitor_new_full(sd_device_monitor **ret, MonitorNetlinkGroup group, } if (fd < 0) { - sock = socket(PF_NETLINK, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK, NETLINK_KOBJECT_UEVENT); + sock = socket(AF_NETLINK, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK, NETLINK_KOBJECT_UEVENT); if (sock < 0) return log_debug_errno(errno, "sd-device-monitor: Failed to create socket: %m"); } diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c index 718073bb8fe..888b5bcf358 100644 --- a/src/libsystemd/sd-netlink/netlink-socket.c +++ b/src/libsystemd/sd-netlink/netlink-socket.c @@ -20,7 +20,7 @@ int socket_open(int family) { int fd; - fd = socket(PF_NETLINK, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK, family); + fd = socket(AF_NETLINK, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK, family); if (fd < 0) return -errno; diff --git a/src/nspawn/nspawn-expose-ports.c b/src/nspawn/nspawn-expose-ports.c index 9d5051d46d9..2890190eec9 100644 --- a/src/nspawn/nspawn-expose-ports.c +++ b/src/nspawn/nspawn-expose-ports.c @@ -174,7 +174,7 @@ int expose_port_send_rtnl(int send_fd) { assert(send_fd >= 0); - fd = socket(PF_NETLINK, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK, NETLINK_ROUTE); + fd = socket(AF_NETLINK, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK, NETLINK_ROUTE); if (fd < 0) return log_error_errno(errno, "Failed to allocate container netlink: %m");