summaryrefslogtreecommitdiff
path: root/src/grp-network/systemd-networkd-wait-online
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-08-01 16:33:32 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-08-01 16:33:32 -0400
commit272b48187cee0b42b6e936ad2c045f13b391f3ad (patch)
tree383049270ccbac5040e4404bbe71ac49d0c423db /src/grp-network/systemd-networkd-wait-online
parent46277a7844c854210eaa0a3612fa297ec33ddb7b (diff)
find src \( -name '*.h' -o -name '*.c' \) -type f -exec ./fixup_includes {} \;
Diffstat (limited to 'src/grp-network/systemd-networkd-wait-online')
-rw-r--r--src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c6
-rw-r--r--src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c11
-rw-r--r--src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c3
-rw-r--r--src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h4
4 files changed, 13 insertions, 11 deletions
diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c
index f03de93540..29384baca3 100644
--- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c
@@ -18,11 +18,11 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <systemd/sd-network.h>
-
#include "basic/alloc-util.h"
-#include "networkd-wait-online-link.h"
#include "basic/string-util.h"
+#include "sd-network/sd-network.h"
+
+#include "networkd-wait-online-link.h"
int link_new(Manager *m, Link **ret, int ifindex, const char *ifname) {
_cleanup_(link_freep) Link *l = NULL;
diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c
index d905590936..62ae9e9b4f 100644
--- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c
@@ -17,17 +17,18 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <netinet/ether.h>
-#include <linux/if.h>
#include <fnmatch.h>
+#include <linux/if.h>
+#include <netinet/ether.h>
#include "basic/alloc-util.h"
-#include "netlink-util.h"
+#include "basic/time-util.h"
+#include "basic/util.h"
+#include "sd-netlink/netlink-util.h"
#include "systemd-network/network-internal.h"
+
#include "networkd-wait-online-link.h"
#include "networkd-wait-online.h"
-#include "basic/time-util.h"
-#include "basic/util.h"
bool manager_ignore_link(Manager *m, Link *link) {
char **ignore;
diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c
index ac3109ee78..feea7c9f34 100644
--- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c
@@ -22,10 +22,11 @@
#include <systemd/sd-daemon.h>
-#include "networkd-wait-online.h"
#include "basic/signal-util.h"
#include "basic/strv.h"
+#include "networkd-wait-online.h"
+
static bool arg_quiet = false;
static usec_t arg_timeout = 120 * USEC_PER_SEC;
static char **arg_interfaces = NULL;
diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h
index 46d01d2bf3..b0d70a18d0 100644
--- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h
@@ -20,10 +20,10 @@
***/
#include <systemd/sd-event.h>
-#include <systemd/sd-netlink.h>
-#include <systemd/sd-network.h>
#include "basic/hashmap.h"
+#include "sd-netlink/sd-netlink.h"
+#include "sd-network/sd-network.h"
typedef struct Manager Manager;