summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libsystemd-network/network-internal.c2
-rw-r--r--src/libsystemd-network/sd-ndisc.c (renamed from src/libsystemd-network/sd-icmp6-nd.c)2
-rw-r--r--src/libsystemd-network/test-ndisc-rs.c (renamed from src/libsystemd-network/test-icmp6-rs.c)2
-rw-r--r--src/network/networkd-dhcp6.c2
-rw-r--r--src/network/networkd-link.h2
-rw-r--r--src/systemd/sd-ndisc.h (renamed from src/systemd/sd-icmp6-nd.h)4
6 files changed, 7 insertions, 7 deletions
diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index 2a62af2fd4..a33affb773 100644
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -32,7 +32,7 @@
#include "conf-parser.h"
#include "condition.h"
#include "network-internal.h"
-#include "sd-icmp6-nd.h"
+#include "sd-ndisc.h"
const char *net_get_name(struct udev_device *device) {
const char *name, *field;
diff --git a/src/libsystemd-network/sd-icmp6-nd.c b/src/libsystemd-network/sd-ndisc.c
index f014cac628..8545344fd7 100644
--- a/src/libsystemd-network/sd-icmp6-nd.c
+++ b/src/libsystemd-network/sd-ndisc.c
@@ -28,7 +28,7 @@
#include "async.h"
#include "dhcp6-internal.h"
-#include "sd-icmp6-nd.h"
+#include "sd-ndisc.h"
#define ICMP6_ROUTER_SOLICITATION_INTERVAL 4 * USEC_PER_SEC
#define ICMP6_MAX_ROUTER_SOLICITATIONS 3
diff --git a/src/libsystemd-network/test-icmp6-rs.c b/src/libsystemd-network/test-ndisc-rs.c
index 27b0ef4572..49305e297b 100644
--- a/src/libsystemd-network/test-icmp6-rs.c
+++ b/src/libsystemd-network/test-ndisc-rs.c
@@ -24,7 +24,7 @@
#include "socket-util.h"
#include "dhcp6-internal.h"
-#include "sd-icmp6-nd.h"
+#include "sd-ndisc.h"
static struct ether_addr mac_addr = {
.ether_addr_octet = {'A', 'B', 'C', '1', '2', '3'}
diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index fb93e6606e..e572ad4595 100644
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -25,7 +25,7 @@
#include "networkd-link.h"
#include "network-internal.h"
-#include "sd-icmp6-nd.h"
+#include "sd-ndisc.h"
#include "sd-dhcp6-client.h"
static int dhcp6_lease_address_acquired(sd_dhcp6_client *client, Link *link);
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index af2ba11701..5bba313049 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -26,7 +26,7 @@
#include "sd-dhcp-client.h"
#include "sd-dhcp-server.h"
#include "sd-ipv4ll.h"
-#include "sd-icmp6-nd.h"
+#include "sd-ndisc.h"
#include "sd-dhcp6-client.h"
#include "sd-lldp.h"
diff --git a/src/systemd/sd-icmp6-nd.h b/src/systemd/sd-ndisc.h
index cb6c24a0cb..240feb7bbe 100644
--- a/src/systemd/sd-icmp6-nd.h
+++ b/src/systemd/sd-ndisc.h
@@ -1,7 +1,7 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef foosdicmp6ndfoo
-#define foosdicmp6ndfoo
+#ifndef foosdndiscfoo
+#define foosdndiscfoo
/***
This file is part of systemd.