diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | src/libsystemd-network/network-internal.c | 2 | ||||
| -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.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-link.h | 2 | ||||
| -rw-r--r-- | src/systemd/sd-ndisc.h (renamed from src/systemd/sd-icmp6-nd.h) | 4 |
8 files changed, 15 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore index 709c8b53d0..b47bd1b2f2 100644 --- a/.gitignore +++ b/.gitignore @@ -195,7 +195,7 @@ /test-hashmap /test-hostname /test-hostname-util -/test-icmp6-rs +/test-ndisc-rs /test-id128 /test-inhibit /test-install diff --git a/Makefile.am b/Makefile.am index e210d8a2da..eba47e4e12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3214,7 +3214,7 @@ libsystemd_network_la_SOURCES = \ src/systemd/sd-dhcp-lease.h \ src/systemd/sd-ipv4ll.h \ src/systemd/sd-ipv4acd.h \ - src/systemd/sd-icmp6-nd.h \ + src/systemd/sd-ndisc.h \ src/systemd/sd-dhcp6-client.h \ src/systemd/sd-dhcp6-lease.h \ src/systemd/sd-pppoe.h \ @@ -3236,7 +3236,7 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/sd-pppoe.c \ src/libsystemd-network/network-internal.c \ src/libsystemd-network/network-internal.h \ - src/libsystemd-network/sd-icmp6-nd.c \ + src/libsystemd-network/sd-ndisc.c \ src/libsystemd-network/sd-dhcp6-client.c \ src/libsystemd-network/dhcp6-internal.h \ src/libsystemd-network/dhcp6-protocol.h \ @@ -3320,15 +3320,15 @@ test_pppoe_LDADD = \ libsystemd-network.la \ libshared.la -test_icmp6_rs_SOURCES = \ +test_ndisc_rs_SOURCES = \ src/systemd/sd-dhcp6-client.h \ - src/systemd/sd-icmp6-nd.h \ + src/systemd/sd-ndisc.h \ src/libsystemd-network/dhcp6-internal.h \ - src/libsystemd-network/test-icmp6-rs.c \ + src/libsystemd-network/test-ndisc-rs.c \ src/libsystemd-network/dhcp-identifier.h \ src/libsystemd-network/dhcp-identifier.c -test_icmp6_rs_LDADD = \ +test_ndisc_rs_LDADD = \ libsystemd-network.la \ libudev.la \ libshared.la @@ -3360,7 +3360,7 @@ tests += \ test-dhcp-client \ test-dhcp-server \ test-ipv4ll \ - test-icmp6-rs \ + test-ndisc-rs \ test-dhcp6-client \ test-lldp 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. |