From 59538b64188055029c59de0eb5e12ed692260096 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 11 Jan 2021 13:29:39 +0900 Subject: [PATCH 1/2] udev: drop doubled blank line --- src/udev/udev-event.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index cd1a926602b..9fb5e4ae623 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -716,7 +716,6 @@ static int spawn_wait(Spawn *spawn) { if (r < 0) return r; - return sd_event_loop(e); } From 2e385c48b4f6bccc2327b7e97c453fdf9941c9fd Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 11 Jan 2021 13:31:33 +0900 Subject: [PATCH 2/2] linux: move nl80211.h to basic/linux As sd-netlink uses the header. --- src/{shared => basic}/linux/nl80211.h | 0 src/basic/meson.build | 1 + 2 files changed, 1 insertion(+) rename src/{shared => basic}/linux/nl80211.h (100%) diff --git a/src/shared/linux/nl80211.h b/src/basic/linux/nl80211.h similarity index 100% rename from src/shared/linux/nl80211.h rename to src/basic/linux/nl80211.h diff --git a/src/basic/meson.build b/src/basic/meson.build index f2d17155de9..11bf4b16aa2 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -118,6 +118,7 @@ basic_sources = files(''' linux/netfilter/nfnetlink.h linux/netlink.h linux/nexthop.h + linux/nl80211.h linux/pkt_sched.h linux/rtnetlink.h linux/wireguard.h