shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 09:21:26 +03:00
Code

Merge pull request #19449 from yuwata/network-downgrade-log-level

Browse Source 
network: downgrade log level and fix typo
This commit is contained in:
Yu Watanabe 2021-04-29 08:54:08 +09:00 committed by GitHub
commit bf8a5f6473
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/networkd-dhcp4.c
View File

@ -358,7 +358,7 @@ static int link_set_dhcp_static_routes(Link *link, struct in_addr *ret_default_g
/* if the DHCP server returns both a Classless Static Routes option and a Static Routes option,
* the DHCP client MUST ignore the Static Routes option. */
if (classless_route && static_route)
log_link_warning(link, "Classless static routes received from DHCP server: ignoring static-route option");
log_link_debug(link, "Classless static routes received from DHCP server: ignoring static-route option");
r = route_new(&route);
if (r < 0)

2
src/network/networkd-link.c
View File

@ -2450,7 +2450,7 @@ static int link_add(Manager *m, sd_netlink_message *message, Link **ret) {
sprintf(ifindex_str, "n%d", link->ifindex);
r = sd_device_new_from_device_id(&device, ifindex_str);
if (r < 0) {
log_link_warning_errno(link, r, "Could not find device, waiting for device initialization: %m");
log_link_debug_errno(link, r, "Could not find device, waiting for device initialization: %m");
return 0;
}

2
src/network/networkd-ndisc.c
View File

@ -558,7 +558,7 @@ static int ndisc_router_process_default(Link *link, sd_ndisc_router *rt) {
if (!route_gw->protocol_set)
route_gw->protocol = RTPROT_RA;
if (!route_gw->pref_set)
route->pref = preference;
route_gw->pref = preference;
route_gw->lifetime = usec_add(time_now, lifetime * USEC_PER_SEC);
if (route_gw->mtu == 0)
route_gw->mtu = mtu;

7
src/network/networkd-neighbor.c
View File

@ -500,10 +500,9 @@ int manager_rtnl_process_neighbor(sd_netlink *rtnl, sd_netlink_message *message,
r = link_get(m, ifindex, &link);
if (r < 0 || !link) {
/* when enumerating we might be out of sync, but we will get the neighbor again, so just
* ignore it */
if (!m->enumerating)
log_warning("rtnl: received neighbor for link '%d' we don't know about, ignoring.", ifindex);
/* when enumerating we might be out of sync, but we will get the neighbor again. Also,
* kernel sends messages about neighbors after a link is removed. So, just ignore it. */
log_debug("rtnl: received neighbor for link '%d' we don't know about, ignoring.", ifindex);
return 0;
}