From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 17 Jul 2020 20:46:53 +0000 (+0900)
Subject: network: replace NDISC -> NDisc in log messages
X-Git-Tag: v246-rc2~45^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F16505%2Fhead;p=thirdparty%2Fsystemd.git

network: replace NDISC -> NDisc in log messages
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 2184a326e13..fc15e510e9e 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -4229,7 +4229,7 @@ int link_save(Link *link) {
                                     sd_dhcp6_lease_get_dns,
                                     NULL);
 
-                /* Make sure to flush out old entries before we use the NDISC data */
+                /* Make sure to flush out old entries before we use the NDisc data */
                 ndisc_vacuum(link);
 
                 if (link->network->ipv6_accept_ra_use_dns && link->ndisc_rdnss) {
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 848c4ba7adc..409db8c3c5a 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -815,14 +815,14 @@ static void ndisc_handler(sd_ndisc *nd, sd_ndisc_event event, sd_ndisc_router *r
                 break;
 
         case SD_NDISC_EVENT_TIMEOUT:
-                log_link_debug(link, "NDISC handler get timeout event");
+                log_link_debug(link, "NDisc handler get timeout event");
                 link->ndisc_addresses_configured = true;
                 link->ndisc_routes_configured = true;
                 link_check_ready(link);
 
                 break;
         default:
-                assert_not_reached("IPv6 Neighbor Discovery unknown event");
+                assert_not_reached("Unknown NDisc event");
         }
 }
 
@@ -948,7 +948,7 @@ int config_parse_ndisc_deny_listed_prefix(
                         return log_oom();
                 if (r < 0) {
                         log_syntax(unit, LOG_WARNING, filename, line, r,
-                                   "Failed to parse NDISC deny-listed prefix, ignoring assignment: %s",
+                                   "Failed to parse NDisc deny-listed prefix, ignoring assignment: %s",
                                    rvalue);
                         return 0;
                 }
@@ -958,7 +958,7 @@ int config_parse_ndisc_deny_listed_prefix(
                 r = in_addr_from_string(AF_INET6, n, &ip);
                 if (r < 0) {
                         log_syntax(unit, LOG_WARNING, filename, line, r,
-                                   "NDISC deny-listed prefix is invalid, ignoring assignment: %s", n);
+                                   "NDisc deny-listed prefix is invalid, ignoring assignment: %s", n);
                         continue;
                 }